diff --git a/.travis.yml b/.travis.yml
index 1aee0e77..526353bf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,32 +1,39 @@
 # Travis CI (https://travis-ci.org/)
+# This will only work on your repo if you have an account on travis and you
+# have set it up to run continuous integration on this this repo
+
+# Linux distribution (bionic beaver)
+dist: bionic
+
+# Language and version
+language: python
+python:
+  - "3.6" # current default Python on Travis CI
 
-language: c
-dist: bionic # based on bionic beaver ubuntu distribution
 cache:
   apt: true # only works with Pro version
 
 env:
-  global: # define environment variables for bash
+  global: # Define environment variables for bash
     - OCTFLAGS="--no-gui --no-window-system --silent"
 
 before_install:
   - travis_retry sudo apt-get -y -qq update
-  # install octave
+  # Install octave
   - travis_retry sudo apt-get -y install octave
   - travis_retry sudo apt-get -y install liboctave-dev
-  # install javascript
+  # Install javascript node and node package manager necessary to run the validator
   - travis_retry sudo apt-get -y install nodejs
   - travis_retry sudo apt-get -y install npm
-  # install miss_hit linter
-  - cd .. && git clone https://github.com/florianschanda/miss_hit.git && export PATH=$PATH:`pwd`/miss_hit && cd CPP_BIDS
-
+  # Install BIDS-Validator
+  - sudo npm install -g bids-validator
+  # Install miss_hit linter
+  - pip3 install miss_hit
 
 install:
   # make octave file the JSONio submodule
   - cd lib/JSONio; mkoctfile --mex jsonread.c jsmn.c -DJSMN_PARENT_LINKS; cd ../..
   - octave $OCTFLAGS --eval "addpath (pwd); savepath ();"
-  # Install BIDS-Validator
-  - sudo npm install -g bids-validator
 
 before_script:
   # Add to src functions to path
@@ -36,11 +43,9 @@ before_script:
 
 jobs:
   include:
-    - stage: "BIDS validator"
-      name: "Create and check dataset"
+    - name: "BIDS validator: create and check dataset"
       script: octave $OCTFLAGS --eval "test_makeRawDataset" && bids-validator `pwd`/output/rawdata/ --ignoreNiftiHeaders
-    - stage: "Linter"
-      name: "miss_hit"
-      script: cd .. && mh_style `pwd`
-      
-    
\ No newline at end of file
+    - name: "miss_hit: checking code quality"
+      script: mh_metric . --ci
+    - name: "miss_hit: checking code style"
+      script: mh_style .
diff --git a/README.md b/README.md
index 68c14ed4..f136a2da 100644
--- a/README.md
+++ b/README.md
@@ -76,6 +76,13 @@ Feel free to open issues to report a bug and ask for improvements.
 
 Here are the naming templates used.
 
+-   Behavior
+
+`sub-<label>[_ses-<label>]_task-<label>[_acq-<label>][_run-<index>]_events.tsv`
+`sub-<label>[_ses-<label>]_task-<label>[_acq-<label>][_run-<index>]_events.json`
+`sub-<label>[_ses-<label>]_task-<label>[_acq-<label>][_run-<index>]_beh.tsv`
+`sub-<label>[_ses-<label>]_task-<label>[_acq-<label>][_run-<index>]_beh.json`
+
 -   BOLD
 
 `sub-<label>[_ses-<label>]_task-<label>[_acq-<label>][_ce-<label>][_dir-<label>][_rec-<label>][_run-<index>][_echo-<index>]_<contrast_label>.nii[.gz]`
@@ -87,6 +94,17 @@ Here are the naming templates used.
 -   EEG
 
 `sub-<label>[_ses-<label>]_task-<label>[_run-<index>]_eeg.<manufacturer_specific_extension>`
+`sub-<label>[_ses-<label>]_task-<label>[_run-<index>]_eeg.json`
+
+<!-- European data format (Each recording consisting of a .edf file)
+
+BrainVision Core Data Format (Each recording consisting of a .vhdr, .vmrk, .eeg file triplet)
+
+The format used by the MATLAB toolbox EEGLAB (Each recording consisting of a .set file with an optional .fdt file)
+
+Biosemi data format (Each recording consisting of a .bdf file) -->
+
+
 
 -   MEG
 
@@ -94,8 +112,19 @@ Here are the naming templates used.
 
 -   Eyetracker
 
+current format
+`<matches>_recording-eyetracking_physio.tsv.gz`
+
+future BEP format in a dedicated eyetracker folder
 `sub-<participant_label>[_ses-<label>][_acq-<label>]_task-<task_label>_eyetrack.<manufacturer_specific_extension>`
 
+-   Stim and physio
+
+`<matches>[_recording-<label>]_physio.tsv.gz`
+`<matches>[_recording-<label>]_physio.json`
+`<matches>[_recording-<label>]_stim.tsv.gz`
+`<matches>[_recording-<label>]_stim.json`
+
 ###  3.3. <a name='Contributors'></a>Contributors ✨
 
 Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
diff --git a/manualTests/dummyData/.bidsignore b/manualTests/dummyData/.bidsignore
new file mode 100644
index 00000000..7e9b244c
--- /dev/null
+++ b/manualTests/dummyData/.bidsignore
@@ -0,0 +1,11 @@
+*_beh.*
+*_eeg.*
+*_ieeg.*
+*_meg.*
+
+# *_beh.tsv
+# *_eeg.edf
+# *_ieeg.edf
+# *_meg.fif
+
+# *_bold.nii.gz
diff --git a/tests/test_createDatasetDescription.m b/manualTests/test_createDatasetDescription.m
similarity index 100%
rename from tests/test_createDatasetDescription.m
rename to manualTests/test_createDatasetDescription.m
diff --git a/manualTests/test_createBoldJson.m b/manualTests/test_createJson.m
similarity index 90%
rename from manualTests/test_createBoldJson.m
rename to manualTests/test_createJson.m
index 6f58d49c..c2fd031f 100644
--- a/manualTests/test_createBoldJson.m
+++ b/manualTests/test_createJson.m
@@ -1,4 +1,4 @@
-function test_suite = test_createBoldJson %#ok<*STOUT>
+function test_suite = test_createJson %#ok<*STOUT>
     try % assignment of 'localfunctions' is necessary in Matlab >= 2016
         test_functions = localfunctions(); %#ok<*NASGU>
     catch % no problem; early Matlab versions can use initTestSuite fine
@@ -6,7 +6,7 @@
     initTestSuite;
 end
 
-function test_createBoldJsonExtra()
+function test_createJsonExtra()
 
     outputDir = fullfile(fileparts(mfilename('fullpath')), 'output');
 
@@ -29,7 +29,7 @@ function test_createBoldJsonExtra()
 
     extraInfo = struct('extraInfo', struct('nestedExtraInfo', 'something extra'));
 
-    createBoldJson(cfg, extraInfo);
+    createJson(cfg, extraInfo);
 
     %% check content
     fileName = strrep(cfg.fileName.events, '_events', '_bold');
diff --git a/manualTests/test_makeRawDataset.m b/manualTests/test_makeRawDataset.m
index d4a89d0c..896b9caf 100644
--- a/manualTests/test_makeRawDataset.m
+++ b/manualTests/test_makeRawDataset.m
@@ -22,6 +22,7 @@ function test_makeRawDataset()
     cfg.subject.runNb = 1;
 
     cfg.task.name = 'testtask';
+    cfg.task.instructions = 'do this';
 
     logFile.extraColumns.Speed.length = 1;
     logFile.extraColumns.LHL24.length = 3;
@@ -30,7 +31,7 @@ function test_makeRawDataset()
     cfg = createFilename(cfg);
 
     extraInfo = struct('extraInfo', struct('nestedExtraInfo', 'something extra'));
-    createBoldJson(cfg, extraInfo);
+    createJson(cfg, extraInfo);
 
     createDatasetDescription(cfg);
 
@@ -82,14 +83,6 @@ function test_makeRawDataset()
     saveEventsFile('save', cfg, stimLogFile);
     saveEventsFile('close', cfg, stimLogFile);
 
-    % add dummy functional data
-    funcDir = fullfile(cfg.dir.output, 'source', 'sub-001', 'ses-001', 'func');
-    boldFilename = 'sub-001_ses-001_task-testtask_run-001_bold.nii.gz';
-
-    copyfile( ...
-        fullfile('dummyData', 'dummyData.nii.gz'), ...
-        fullfile(funcDir, boldFilename));
-
     %% MRI bold rest data and fancy suffixes
     clear cfg;
 
@@ -97,34 +90,158 @@ function test_makeRawDataset()
 
     cfg.testingDevice = 'mri';
 
-    cfg.subject.subjectNb = 2;
-    cfg.subject.sessionNb = 3;
-    cfg.subject.runNb = 4;
+    cfg.subject.subjectNb = 1;
+    cfg.subject.runNb = 1;
 
     % deal with MRI suffixes
-    cfg.mri.reconstruction = 'fast recon';
-    cfg.mri.contrastEnhancement = 'test';
-    cfg.mri.phaseEncodingDirection = 'y pos';
-    cfg.mri.echo = '1';
-    cfg.mri.acquisition = ' new tYpe';
+    cfg.suffix.reconstruction = 'fast recon';
+    cfg.suffix.contrastEnhancement = 'test';
+    cfg.suffix.phaseEncodingDirection = 'y pos';
+    cfg.suffix.echo = '1';
+    cfg.suffix.acquisition = ' new tYpe';
+
     cfg.mri.repetitionTime = 1.56;
 
     cfg.task.name = 'rest';
 
     cfg = createFilename(cfg);
 
-    createBoldJson(cfg);
+    extraInfo = struct('extraInfo', struct('nestedExtraInfo', 'something extra'));
+    createJson(cfg, extraInfo);
+
+    %% EEG data and fancy suffixes
+    clear cfg;
+
+    cfg.dir.output = outputDir;
+
+    cfg.testingDevice = 'eeg';
+
+    cfg.subject.subjectNb = 1;
+    cfg.subject.runNb = 1;
+
+    cfg.task.name = 'target practice';
+    cfg.task.instructions = 'do this';
+
+    cfg.bids.eeg.EEGReference = 'Cz';
+    cfg.bids.eeg.SamplingFrequency = 2400;
+    cfg.bids.eeg.PowerLineFrequency = 50;
+    cfg.bids.eeg.SoftwareFilters = 'n/a';
+
+    cfg = createFilename(cfg);
+
+    extraInfo = struct('extraInfo', struct('nestedExtraInfo', 'something extra'));
+    createJson(cfg, extraInfo);
+
+    %% iEEG data and fancy suffixes
+    clear cfg;
+
+    cfg.dir.output = outputDir;
+
+    cfg.testingDevice = 'ieeg';
+
+    cfg.subject.subjectNb = 1;
+    cfg.subject.runNb = 1;
+
+    cfg.task.name = 'implanted target practice';
+    cfg.task.instructions = 'do this';
+
+    cfg.bids.ieeg.iEEGReference = 'Cz';
+    cfg.bids.ieeg.SamplingFrequency = 2400;
+    cfg.bids.ieeg.PowerLineFrequency = 50;
+    cfg.bids.ieeg.SoftwareFilters = 'n/a';
+
+    cfg = createFilename(cfg);
+
+    extraInfo = struct('extraInfo', struct('nestedExtraInfo', 'something extra'));
+    createJson(cfg, extraInfo);
+
+    %% MEG data and fancy suffixes
+    clear cfg;
+
+    cfg.dir.output = outputDir;
+
+    cfg.testingDevice = 'meg';
+
+    cfg.subject.subjectNb = 1;
+    cfg.subject.runNb = 1;
+
+    cfg.task.name = 'magnetic target practice';
+    cfg.task.instructions = 'do this';
+
+    cfg.bids.meg.SamplingFrequency = 2400;
+    cfg.bids.meg.PowerLineFrequency = 60;
+    cfg.bids.meg.DewarPosition = 'upright';
+    cfg.bids.meg.SoftwareFilters = 'n/a';
+    cfg.bids.meg.DigitizedLandmarks = false;
+    cfg.bids.meg.DigitizedHeadPoints = false;
+
+    cfg = createFilename(cfg);
+
+    extraInfo = struct('extraInfo', struct('nestedExtraInfo', 'something extra'));
+    createJson(cfg, extraInfo);
+
+    %% beh data and fancy suffixes
+    clear cfg;
+
+    cfg.dir.output = outputDir;
+
+    cfg.testingDevice = 'pc';
+
+    cfg.subject.subjectNb = 1;
+    cfg.subject.runNb = 1;
+
+    cfg.task.name = 'easy target practice';
+    cfg.task.instructions = 'do this';
+
+    cfg = createFilename(cfg);
+
+    extraInfo = struct('extraInfo', struct('nestedExtraInfo', 'something extra'));
+    createJson(cfg, extraInfo);
 
-    %% add dummy functional data
-    funcDir = fullfile(cfg.dir.output, 'source', 'sub-002', 'ses-003', 'func');
-    boldFilename = ['sub-002_ses-003_task-rest',  ...
+    %% add dummy data
+    subjectDir = fullfile(cfg.dir.output, 'source', 'sub-001', 'ses-001');
+    funcDir = fullfile(subjectDir, 'func');
+
+    boldFilename = 'sub-001_ses-001_task-testtask_run-001_bold.nii.gz';
+
+    copyfile( ...
+        fullfile('dummyData', 'dummyData.nii.gz'), ...
+        fullfile(funcDir, boldFilename));
+
+    boldFilename = ['sub-001_ses-001_task-rest',  ...
         '_acq-newTYpe_ce-test_dir-yPos_rec-fastRecon', ...
-        '_run-004_echo-1_bold.nii.gz'];
+        '_run-001_echo-1_bold.nii.gz'];
 
     copyfile( ...
         fullfile('dummyData', 'dummyData.nii.gz'), ...
         fullfile(funcDir, boldFilename));
 
+    eegDir = fullfile(subjectDir, 'eeg');
+    megDir = fullfile(subjectDir, 'meg');
+    ieegDir = fullfile(subjectDir, 'ieeg');
+    behDir = fullfile(subjectDir, 'beh');
+
+    eegFilename = 'sub-001_ses-001_task-targetPractice_run-001_eeg.edf';
+    megFilename = 'sub-001_ses-001_task-magneticTargetPractice_run-001_meg.fif';
+    ieegFilename = 'sub-001_ses-001_task-implantedTargetPractice_run-001_ieeg.edf';
+    behFilename = 'sub-001_ses-001_task-easyTargetPractice_run-001_beh.tsv';
+
+    copyfile( ...
+        fullfile('dummyData', 'dummyData.nii.gz'), ...
+        fullfile(eegDir, eegFilename));
+
+    copyfile( ...
+        fullfile('dummyData', 'dummyData.nii.gz'), ...
+        fullfile(megDir, megFilename));
+
+    copyfile( ...
+        fullfile('dummyData', 'dummyData.nii.gz'), ...
+        fullfile(ieegDir, ieegFilename));
+
+    copyfile( ...
+        fullfile('dummyData', 'dummyData.nii.gz'), ...
+        fullfile(behDir, behFilename));
+
     %% actually do the conversion of the source data thus created
     clear;
 
diff --git a/miss_hit.cfg b/miss_hit.cfg
index f7065cfc..550425e6 100644
--- a/miss_hit.cfg
+++ b/miss_hit.cfg
@@ -1,4 +1,11 @@
+# styly guide (https://florianschanda.github.io/miss_hit/style_checker.html)
 line_length: 100
 regex_function_name: "[a-z]+(([A-Z]){1}[A-Za-z]+)*"
 suppress_rule: "copyright_notice"
-exclude_dir: "lib"
\ No newline at end of file
+exclude_dir: "lib"
+
+# metrics limit for the code quality (https://florianschanda.github.io/miss_hit/metrics.html)
+metric "cnest": limit 4
+metric "file_length": limit 500
+metric "cyc": limit 15
+metric "parameters": limit 6
\ No newline at end of file
diff --git a/src/checkCFG.m b/src/checkCFG.m
index a1563897..8f6f64ab 100644
--- a/src/checkCFG.m
+++ b/src/checkCFG.m
@@ -37,9 +37,12 @@
 
     %% BIDS
 
+    fieldsToSet = behJsonDefaults(fieldsToSet);
     fieldsToSet = datasetDescriptionDefaults(fieldsToSet);
-    fieldsToSet = mriJsonDefaults(fieldsToSet);
+    fieldsToSet = eegJsonDefaults(fieldsToSet);
+    fieldsToSet = ieegJsonDefaults(fieldsToSet);
     fieldsToSet = megJsonDefaults(fieldsToSet);
+    fieldsToSet = mriJsonDefaults(fieldsToSet);
 
     fieldsToSet = transferInfoToBids(fieldsToSet, cfg);
 
@@ -51,14 +54,15 @@
 function fieldsToSet = mriDefaults(fieldsToSet)
 
     % for file naming and JSON
-    fieldsToSet.mri.contrastEnhancement = [];
-    fieldsToSet.mri.phaseEncodingDirection = [];
-    fieldsToSet.mri.reconstruction = [];
-    fieldsToSet.mri.echo = [];
-    fieldsToSet.mri.acquisition = [];
-    fieldsToSet.mri.repetitionTime = [];
+    fieldsToSet.suffix.contrastEnhancement = [];
+    fieldsToSet.suffix.phaseEncodingDirection = [];
+    fieldsToSet.suffix.reconstruction = [];
+    fieldsToSet.suffix.echo = [];
+    fieldsToSet.suffix.acquisition = [];
+    fieldsToSet.suffix.repetitionTime = [];
+    fieldsToSet.suffix.recording = [];
 
-    fieldsToSet.mri = orderfields(fieldsToSet.mri);
+    fieldsToSet.suffix = orderfields(fieldsToSet.suffix);
 
 end
 
@@ -133,7 +137,7 @@
     % REQUIRED Name of the task (for resting state use the "rest" prefix). No two tasks
     % should have the same name. Task label is derived from this field by
     % removing all non alphanumeric ([a-zA-Z0-9]) characters.
-    fieldsToSet.bids.mri.TaskName = [];
+    fieldsToSet.bids.mri.TaskName = '';
 
     % RECOMMENDED Text of the instructions given to participants before the scan.
     % This is especially important in context of resting state fMRI and
@@ -157,14 +161,16 @@
     % REQUIRED Name of the task (for resting state use the "rest" prefix). No two tasks
     % should have the same name. Task label is derived from this field by
     % removing all non alphanumeric ([a-zA-Z0-9]) characters.
-    fieldsToSet.bids.meg.TaskName = [];
+    fieldsToSet.bids.meg.TaskName = '';
+
+    fieldsToSet.bids.meg.Instructions = '';
 
     % REQUIRED Sampling frequency
     fieldsToSet.bids.meg.SamplingFrequency = [];
 
     % REQUIRED Frequency (in Hz) of the power grid at the geographical location of
     % the MEG instrument (i.e. 50 or 60):
-    fieldsToSet.bids.meg.PowerLineFrequency = [];
+    fieldsToSet.bids.meg.PowerLineFrequency = 50;
 
     % REQUIRED Position of the dewar during the MEG scan: "upright", "supine" or
     % "degrees" of angle from vertical: for example on CTF systems,
@@ -176,7 +182,7 @@
     % values: e.g., {"SSS": {"frame": "head", "badlimit": 7}},
     % {"SpatialCompensation": {"GradientOrder": Order of the gradient
     % compensation}}. Write "n/a" if no software filters applied.
-    fieldsToSet.bids.meg.SoftwareFilters = [];
+    fieldsToSet.bids.meg.SoftwareFilters = 'n/a';
 
     % REQUIRED Boolean ("true" or "false") value indicating whether anatomical
     % landmark points (i.e. fiducials) are contained within this recording.
@@ -189,3 +195,52 @@
     fieldsToSet.bids.meg = orderfields(fieldsToSet.bids.meg);
 
 end
+
+function fieldsToSet = eegJsonDefaults(fieldsToSet)
+    % for json for EEG data
+
+    fieldsToSet.bids.eeg.TaskName = '';
+
+    fieldsToSet.bids.eeg.Instructions = '';
+
+    fieldsToSet.bids.eeg.EEGReference = '';
+
+    fieldsToSet.bids.eeg.SamplingFrequency = [];
+
+    fieldsToSet.bids.eeg.PowerLineFrequency = 50;
+
+    fieldsToSet.bids.eeg.SoftwareFilters = 'n/a';
+
+    fieldsToSet.bids.eeg = orderfields(fieldsToSet.bids.eeg);
+
+end
+
+function fieldsToSet = ieegJsonDefaults(fieldsToSet)
+    % for json for iEEG data
+
+    fieldsToSet.bids.ieeg.TaskName = '';
+
+    fieldsToSet.bids.ieeg.Instructions = '';
+
+    fieldsToSet.bids.ieeg.iEEGReference = '';
+
+    fieldsToSet.bids.ieeg.SamplingFrequency = [];
+
+    fieldsToSet.bids.ieeg.PowerLineFrequency = 50;
+
+    fieldsToSet.bids.ieeg.SoftwareFilters = 'n/a';
+
+    fieldsToSet.bids.ieeg = orderfields(fieldsToSet.bids.ieeg);
+
+end
+
+function fieldsToSet = behJsonDefaults(fieldsToSet)
+    % for json for BEH data
+
+    fieldsToSet.bids.beh.TaskName = [];
+
+    fieldsToSet.bids.beh.Instructions = [];
+
+    fieldsToSet.bids.ieeg = orderfields(fieldsToSet.bids.beh);
+
+end
diff --git a/src/convertSourceToRaw.m b/src/convertSourceToRaw.m
index 179b7167..c70854a7 100644
--- a/src/convertSourceToRaw.m
+++ b/src/convertSourceToRaw.m
@@ -19,6 +19,9 @@ function convertSourceToRaw(cfg)
     copyfile(fullfile( ...
         fileparts(mfilename('fullpath')), '..', 'manualTests', 'dummyData', 'CHANGES'), ...
         sourceDir);
+    copyfile(fullfile( ...
+        fileparts(mfilename('fullpath')), '..', 'manualTests', 'dummyData', '.bidsignore'), ...
+        sourceDir);
 
     copyfile(sourceDir, rawDir);
 
@@ -35,7 +38,7 @@ function convertSourceToRaw(cfg)
         sess = cellstr(file_utils('List', fullfile(rawDir, subjects{su}), 'dir', '^ses-.*$'));
 
         for se = 1:numel(sess)
-            parseFunc(rawDir, subjects{su}, sess{se});
+            removeAllDateSuffix(rawDir, subjects{su}, sess{se});
         end
 
     end
diff --git a/src/createBoldJson.m b/src/createBoldJson.m
deleted file mode 100644
index e198c142..00000000
--- a/src/createBoldJson.m
+++ /dev/null
@@ -1,37 +0,0 @@
-function createBoldJson(cfg, extraInfo)
-    % createBoldJson(cfg, extraInfo)
-    %
-    % Creates the side car JSON file for a BOLD functional run.
-    % This will only contain the minimum BIDS requirement and will likey be less
-    % complete than the info you could from DICOM conversion.
-    %
-    % Extra content can be added to the JSON file
-
-    opts.Indent = '    ';
-
-    if nargin < 2
-        extraInfo = struct();
-    end
-
-    fileName = strrep(cfg.fileName.events, '_events', '_bold');
-    fileName = strrep(fileName, '.tsv', '.json');
-
-    fileName = fullfile( ...
-        cfg.dir.outputSubject, ...
-        cfg.fileName.modality, ...
-        fileName);
-
-    jsonContent = cfg.bids.mri;
-
-    % add content of extraInfo to the JSON content
-    if ~isstruct(extraInfo)
-        warning('additional info added to a json file must be a structure');
-    end
-    fieldList = fieldnames(extraInfo);
-    for iField = 1:numel(fieldList)
-        jsonContent.(fieldList{iField}) =  extraInfo.(fieldList{iField});
-    end
-
-    bids.util.jsonencode(fileName, jsonContent, opts);
-
-end
diff --git a/src/createFilename.m b/src/createFilename.m
index 27a1f833..6e3f2ab6 100644
--- a/src/createFilename.m
+++ b/src/createFilename.m
@@ -91,10 +91,6 @@
     [~, ~, ~] = mkdir(cfg.dir.outputSubject);
     [~, ~, ~] = mkdir(fullfile(cfg.dir.outputSubject, modality));
 
-    if cfg.eyeTracker.do
-        [~, ~, ~] = mkdir(fullfile(cfg.dir.outputSubject, 'eyetracker'));
-    end
-
 end
 
 function cfg = setSuffixes(cfg)
@@ -109,6 +105,7 @@
         'echo', ...
         'phaseEncodingDirection', ...
         'reconstruction', ...
+        'recording', ...
         };
 
     targetFields = { ...
@@ -117,21 +114,22 @@
         'echo', ...
         'dir', ...
         'rec', ...
+        'recording', ...
         };
 
     for iField = 1:numel(fields2Check)
 
-        if isempty (cfg.mri.(fields2Check{iField})) %#ok<*GFLD>
+        if isempty (cfg.suffix.(fields2Check{iField})) %#ok<*GFLD>
 
-            cfg.fileName.suffix.mri.(fields2Check{iField}) = ''; %#ok<*SFLD>
+            cfg.fileName.suffix.(fields2Check{iField}) = ''; %#ok<*SFLD>
 
         else
 
             % upper camelCase and remove invalid characters
-            thisField = getfield(cfg.mri, fields2Check{iField});
+            thisField = getfield(cfg.suffix, fields2Check{iField});
             [~, validFieldName] = createValidName(thisField);
 
-            cfg.fileName.suffix.mri.(fields2Check{iField}) = ...
+            cfg.fileName.suffix.(fields2Check{iField}) = ...
                 ['_' targetFields{iField} '-' validFieldName];
 
         end
@@ -148,11 +146,12 @@
     pattern = cfg.fileName.pattern;
 
     runSuffix = cfg.fileName.suffix.run;
-    acqSuffix = cfg.fileName.suffix.mri.acquisition ;
-    ceSuffix = cfg.fileName.suffix.mri.contrastEnhancement ;
-    dirSuffix = cfg.fileName.suffix.mri.phaseEncodingDirection ;
-    recSuffix = cfg.fileName.suffix.mri.reconstruction ;
-    echoSuffix = cfg.fileName.suffix.mri.echo;
+    acqSuffix = cfg.fileName.suffix.acquisition ;
+    ceSuffix = cfg.fileName.suffix.contrastEnhancement ;
+    dirSuffix = cfg.fileName.suffix.phaseEncodingDirection ;
+    recSuffix = cfg.fileName.suffix.reconstruction ;
+    echoSuffix = cfg.fileName.suffix.echo;
+    recordingSuffix = cfg.fileName.suffix.recording;
 
     thisDate = cfg.fileName.date;
 
@@ -171,26 +170,31 @@
 
         case 'func'
 
-            cfg.fileName.events = ...
-                [fileNameBase, ...
+            basename = [fileNameBase, ...
                 acqSuffix, ceSuffix, ...
                 dirSuffix, recSuffix, ...
-                runSuffix, echoSuffix, ...
-                '_events_date-' thisDate '.tsv'];
+                runSuffix, echoSuffix];
+
+        case 'beh'
+
+            basename = ...
+                [fileNameBase, ...
+                acqSuffix, ...
+                runSuffix];
 
         otherwise
 
-            cfg.fileName.events = ...
-                [fileNameBase, runSuffix, '_events_date-' thisDate '.tsv'];
+            basename = [fileNameBase, runSuffix];
 
     end
 
-    cfg.fileName.stim = strrep(cfg.fileName.events, 'events', 'stim');
+    cfg.fileName.events = [basename, '_events_date-' thisDate '.tsv'];
+
+    cfg.fileName.stim = [basename, recordingSuffix, '_stim_date-' thisDate '.tsv'];
 
     if cfg.eyeTracker.do
         cfg.fileName.eyetracker = ...
-            [fileNameBase, acqSuffix, ...
-            runSuffix, '_eyetrack_date-' thisDate '.edf'];
+            [basename, '_recording-eyetracking_physio_date-' thisDate '.edf'];
     end
 
 end
diff --git a/src/createJson.m b/src/createJson.m
new file mode 100644
index 00000000..15bbbe1e
--- /dev/null
+++ b/src/createJson.m
@@ -0,0 +1,127 @@
+function createJson(varargin)
+    % createBoldJson(cfg, varargin)
+    %
+    % Creates the side car JSON file for a run.
+    % This will only contain the minimum BIDS requirement and will likey be less
+    % complete than the info you could from a proper conversion.
+    %
+    % USAGE
+    %
+    % createJson(cfg, modality)
+    %
+    %   modality is string ('beh', 'func', 'eeg', 'ieeg', 'meg') to specify which
+    %   JSON to save
+    %
+    %
+    % createJson(cfg, extraInfo)
+    %
+    %   extraInfo is a strcuture to add axtra content can be added to the JSON file
+    %
+    %
+    % createJson(cfg, modality, extraInfo)
+    %
+    %   both are possible
+    %
+    %
+
+    [cfg, modality, extraInfo] = checkInput(varargin);
+
+    if strcmp(modality, 'func')
+        fileName = strrep(cfg.fileName.events, '_events', '_bold');
+        jsonContent = cfg.bids.mri;
+    else
+        fileName = strrep(cfg.fileName.events, '_events', ['_' modality]);
+        jsonContent = cfg.bids.(modality);
+    end
+
+    fileName = strrep(fileName, '.tsv', '.json');
+
+    fileName = fullfile( ...
+        cfg.dir.outputSubject, ...
+        modality, ...
+        fileName);
+
+    %% add content of extraInfo to the JSON content
+
+    fieldList = fieldnames(extraInfo);
+    for iField = 1:numel(fieldList)
+        jsonContent.(fieldList{iField}) =  extraInfo.(fieldList{iField});
+    end
+
+    %% save
+    opts.Indent = '    ';
+    bids.util.jsonencode(fileName, jsonContent, opts);
+
+end
+
+function [cfg, modality, extraInfo] = checkInput(varargin)
+
+    % trying to parse inputs
+    % modality is either given as a string by user or guessed from cfg.fileName
+    % extraInfo must be a structure
+
+    input = varargin{1};
+
+    modality = '';
+    extraInfo = struct();
+
+    switch numel(input)
+
+        case 0
+            errorCreateJson('notEnoughInput');
+
+        case 1
+            cfg = input{1};
+            if isfield(cfg.fileName, 'modality')
+                modality = cfg.fileName.modality;
+            end
+
+        case 2
+            cfg = input{1};
+            if ischar(input{2})
+                modality = input{2};
+            elseif isstruct(input{2})
+                modality = cfg.fileName.modality;
+                extraInfo = input{2};
+            else
+                errorCreateJson('wrongInputType');
+            end
+
+        otherwise
+            cfg = input{1};
+            modality = input{2};
+            extraInfo = input{3};
+
+    end
+
+    if ~ischar(modality) || ...
+            all(~strcmpi(modality, {'beh', 'func', 'eeg', 'ieeg', 'meg'}))
+        errorCreateJson('wrongModalityInput', modality);
+    end
+
+    if ~isstruct(extraInfo)
+        warning('Additional info added to a json file must be a structure.');
+    end
+
+end
+
+function errorCreateJson(identifier, varargin)
+
+    switch identifier
+        case 'notEnoughInput'
+            errorStruct.message = 'First input must be a valid cfg structure.';
+
+        case 'wrongInputType'
+            errorStruct.message = ['The second input must be a string (modality)' ...
+                'or a structure (extraInfo)'];
+        case 'wrongModalityInput'
+            errorStruct.message = sprintf(['The given modality is not valid: %s.\n', ...
+                'Only the following string are accepted: beh, func, eeg, ieeg, meg'], ...
+                varargin{1});
+
+    end
+
+    errorStruct.identifier = ['createJson:' identifier];
+
+    error(errorStruct);
+end
diff --git a/src/subfun/parseFunc.m b/src/subfun/parseFunc.m
deleted file mode 100644
index 524ae0cd..00000000
--- a/src/subfun/parseFunc.m
+++ /dev/null
@@ -1,45 +0,0 @@
-function parseFunc(rawDir, subjName, sesName)
-    % parseFunc(rawDir, subjName, sesName)
-    %
-
-    subjectPath = fullfile(rawDir, subjName, sesName, 'func');
-
-    if exist(subjectPath, 'dir')
-
-        % do events
-        filenames = file_utils('List', subjectPath, ...
-            sprintf('^%s.*_task-.*_events_date-.*$', subjName));
-
-        removeDateSuffix(filenames, subjectPath);
-
-        % do bold
-        filenames = file_utils('List', subjectPath, ...
-            sprintf('^%s.*_task-.*_bold_date-.*$', subjName));
-
-        removeDateSuffix(filenames, subjectPath);
-
-        % do stim
-        filenames = file_utils('List', subjectPath, ...
-            sprintf('^%s.*_task-.*_stim_date-.*tsv$', subjName));
-        compressFiles(filenames, subjectPath);
-        filenames = file_utils('List', subjectPath, ...
-            sprintf('^%s.*_task-.*_stim_date-.*tsv.gz$', subjName));
-        removeDateSuffix(filenames, subjectPath);
-
-    end
-end
-
-function compressFiles(filenames, subjectPath)
-    if isempty(filenames)
-        filenames = {};
-    else
-        filenames = cellstr(filenames);
-    end
-
-    for i = 1:numel(filenames)
-
-        gzip(fullfile(subjectPath, filenames{i}));
-        delete(fullfile(subjectPath, filenames{i}));
-
-    end
-end
diff --git a/src/subfun/removeAllDateSuffix.m b/src/subfun/removeAllDateSuffix.m
new file mode 100644
index 00000000..1f0bf0c3
--- /dev/null
+++ b/src/subfun/removeAllDateSuffix.m
@@ -0,0 +1,52 @@
+function removeAllDateSuffix(rawDir, subjName, sesName)
+    % removeAllDateSuffix(rawDir, subjName, sesName)
+    %
+
+    labels = {'func', 'bold', 'eeg', 'ieeg', 'meg', 'beh'};
+
+    for iModality = 1:numel(labels)
+
+        subjectPath = fullfile(rawDir, subjName, sesName, labels{iModality});
+
+        if exist(subjectPath, 'dir')
+
+            % do events
+            filenames = file_utils('List', subjectPath, ...
+                sprintf('^%s.*_task-.*_events_date-.*$', subjName));
+
+            removeDateSuffix(filenames, subjectPath);
+
+            for iLabel = 1:numel(labels)
+                filenames = file_utils('List', subjectPath, ...
+                    sprintf('^%s.*_task-.*_%s_date-.*$', subjName, labels{iLabel}));
+
+                removeDateSuffix(filenames, subjectPath);
+            end
+
+            % do stim
+            filenames = file_utils('List', subjectPath, ...
+                sprintf('^%s.*_task-.*_stim_date-.*tsv$', subjName));
+            compressFiles(filenames, subjectPath);
+            filenames = file_utils('List', subjectPath, ...
+                sprintf('^%s.*_task-.*_stim_date-.*tsv.gz$', subjName));
+            removeDateSuffix(filenames, subjectPath);
+
+        end
+
+    end
+end
+
+function compressFiles(filenames, subjectPath)
+    if isempty(filenames)
+        filenames = {};
+    else
+        filenames = cellstr(filenames);
+    end
+
+    for i = 1:numel(filenames)
+
+        gzip(fullfile(subjectPath, filenames{i}));
+        delete(fullfile(subjectPath, filenames{i}));
+
+    end
+end
diff --git a/src/subfun/transferInfoToBids.m b/src/subfun/transferInfoToBids.m
index ab00c0e7..c2267e41 100644
--- a/src/subfun/transferInfoToBids.m
+++ b/src/subfun/transferInfoToBids.m
@@ -8,9 +8,20 @@
         [taskName, taskNameValid] = createValidName(cfg.task.name);
         fieldsToSet.fileName.task = taskNameValid;
         fieldsToSet.bids.meg.TaskName = taskName;
+        fieldsToSet.bids.eeg.TaskName = taskName;
+        fieldsToSet.bids.ieeg.TaskName = taskName;
+        fieldsToSet.bids.beh.TaskName = taskName;
         fieldsToSet.bids.mri.TaskName = taskName;
     end
 
+    if isfield(cfg, 'task') && isfield(cfg.task, 'instructions')
+        fieldsToSet.bids.meg.Instructions = cfg.task.instructions;
+        fieldsToSet.bids.eeg.Instructions = cfg.task.instructions;
+        fieldsToSet.bids.ieeg.Instructions = cfg.task.instructions;
+        fieldsToSet.bids.beh.Instructions = cfg.task.instructions;
+        fieldsToSet.bids.mri.Instructions = cfg.task.instructions;
+    end
+
     if isfield(cfg, 'mri') && isfield(cfg.mri, 'repetitionTime')
         fieldsToSet.bids.mri.RepetitionTime = cfg.mri.repetitionTime;
     end
diff --git a/tests/test_checkCFG.m b/tests/test_checkCFG.m
index 3ed0d09f..fad74a9b 100644
--- a/tests/test_checkCFG.m
+++ b/tests/test_checkCFG.m
@@ -17,6 +17,8 @@ function test_checkCfgDefault()
     expectedStructure.dir.output = cfg.dir.output;
     expectedStructure.testingDevice = 'pc';
 
+    expectedStructure = orderfields(expectedStructure);
+
     %% test
     assertEqual(expectedStructure, cfg);
 
@@ -62,8 +64,11 @@ function test_checkCfgBasic()
     expectedStructure.fileName.task = 'testTask';
 
     expectedStructure.bids.mri.RepetitionTime = 1.56;
-    expectedStructure.bids.mri.TaskName = 'test Task';
 
+    expectedStructure.bids.mri.TaskName = 'test Task';
+    expectedStructure.bids.beh.TaskName = 'test Task';
+    expectedStructure.bids.ieeg.TaskName = 'test Task';
+    expectedStructure.bids.eeg.TaskName = 'test Task';
     expectedStructure.bids.meg.TaskName = 'test Task';
 
     expectedStructure.bids.datasetDescription.Name = 'dummy';
@@ -91,12 +96,16 @@ function test_checkCfgBasic()
 
     expectedCfgStructure.eyeTracker.do = false;
 
-    expectedCfgStructure.mri.contrastEnhancement = [];
-    expectedCfgStructure.mri.phaseEncodingDirection = [];
-    expectedCfgStructure.mri.reconstruction = [];
-    expectedCfgStructure.mri.echo = [];
-    expectedCfgStructure.mri.acquisition = [];
-    expectedCfgStructure.mri.repetitionTime = [];
+    expectedCfgStructure.suffix.contrastEnhancement = [];
+    expectedCfgStructure.suffix.phaseEncodingDirection = [];
+    expectedCfgStructure.suffix.reconstruction = [];
+    expectedCfgStructure.suffix.echo = [];
+    expectedCfgStructure.suffix.acquisition = [];
+    expectedCfgStructure.suffix.repetitionTime = [];
+    expectedCfgStructure.suffix.recording = [];
+
+    expectedCfgStructure.bids.beh.TaskName = '';
+    expectedCfgStructure.bids.beh.Instructions = '';
 
     expectedCfgStructure.bids.mri.RepetitionTime = [];
     expectedCfgStructure.bids.mri.SliceTiming = '';
@@ -104,11 +113,26 @@ function test_checkCfgBasic()
     expectedCfgStructure.bids.mri.Instructions = '';
     expectedCfgStructure.bids.mri.TaskDescription = '';
 
+    expectedCfgStructure.bids.eeg.TaskName = '';
+    expectedCfgStructure.bids.eeg.Instructions = '';
+    expectedCfgStructure.bids.eeg.EEGReference = '';
+    expectedCfgStructure.bids.eeg.SamplingFrequency = [];
+    expectedCfgStructure.bids.eeg.PowerLineFrequency = 50;
+    expectedCfgStructure.bids.eeg.SoftwareFilters = 'n/a';
+
+    expectedCfgStructure.bids.ieeg.TaskName = '';
+    expectedCfgStructure.bids.ieeg.Instructions = '';
+    expectedCfgStructure.bids.ieeg.iEEGReference = '';
+    expectedCfgStructure.bids.ieeg.SamplingFrequency = [];
+    expectedCfgStructure.bids.ieeg.PowerLineFrequency = 50;
+    expectedCfgStructure.bids.ieeg.SoftwareFilters = 'n/a';
+
     expectedCfgStructure.bids.meg.TaskName = '';
+    expectedCfgStructure.bids.meg.Instructions = '';
     expectedCfgStructure.bids.meg.SamplingFrequency = [];
-    expectedCfgStructure.bids.meg.PowerLineFrequency = [];
+    expectedCfgStructure.bids.meg.PowerLineFrequency = 50;
     expectedCfgStructure.bids.meg.DewarPosition = [];
-    expectedCfgStructure.bids.meg.SoftwareFilters = [];
+    expectedCfgStructure.bids.meg.SoftwareFilters = 'n/a';
     expectedCfgStructure.bids.meg.DigitizedLandmarks = [];
     expectedCfgStructure.bids.meg.DigitizedHeadPoints = [];
 
@@ -122,6 +146,8 @@ function test_checkCfgBasic()
     expectedCfgStructure.bids.datasetDescription.ReferencesAndLinks = {''};
     expectedCfgStructure.bids.datasetDescription.DatasetDOI = '';
 
+    expectedCfgStructure.bids = orderfields(expectedCfgStructure.bids);
+
     expectedCfgStructure = orderfields(expectedCfgStructure);
 
 end
diff --git a/tests/test_createBoldJson.m b/tests/test_createBoldJson.m
deleted file mode 100644
index 769d7148..00000000
--- a/tests/test_createBoldJson.m
+++ /dev/null
@@ -1,41 +0,0 @@
-function test_suite = test_createBoldJson %#ok<*STOUT>
-    try % assignment of 'localfunctions' is necessary in Matlab >= 2016
-        test_functions = localfunctions(); %#ok<*NASGU>
-    catch % no problem; early Matlab versions can use initTestSuite fine
-    end
-    initTestSuite;
-end
-
-function test_createBoldJsonBasic()
-
-    outputDir = fullfile(fileparts(mfilename('fullpath')), '..', 'output');
-
-    %% set up
-
-    cfg.verbose = false;
-
-    cfg.subject.subjectNb = 1;
-    cfg.subject.runNb = 1;
-
-    cfg.task.name = 'testtask';
-
-    cfg.dir.output = outputDir;
-
-    cfg.testingDevice = 'mri';
-
-    cfg = createFilename(cfg);
-
-    logFile = saveEventsFile('init', cfg); %#ok<*NASGU>
-
-    createBoldJson(cfg);
-
-    %% data to test against
-    funcDir = fullfile(outputDir, 'source', 'sub-001', 'ses-001', 'func');
-
-    eventFilename = ['sub-001_ses-001_task-testtask_run-001_bold_date-' ...
-        cfg.fileName.date '.json'];
-
-    %% test
-    assertTrue(exist(fullfile(funcDir, eventFilename), 'file') == 2);
-
-end
diff --git a/tests/test_createFilename.m b/tests/test_createFilename.m
index 2c8c0fd7..336eef0c 100644
--- a/tests/test_createFilename.m
+++ b/tests/test_createFilename.m
@@ -8,22 +8,14 @@
 
 function test_createFilenameBasic()
 
-    outputDir = fullfile(fileparts(mfilename('fullpath')), '..', 'output');
-
     %% set up
 
-    cfg.verbose = true;
-    cfg.subject.subjectNb = 1;
-    cfg.subject.runNb = 1;
-    cfg.task.name = 'test task';
-    cfg.dir.output = outputDir;
+    cfg = setUp();
 
     cfg = createFilename(cfg);
 
     %% data to test against
-    behDir = fullfile(outputDir, 'source', 'sub-001', 'ses-001', 'beh');
-
-    eyetrackerDir = fullfile(outputDir, 'source', 'sub-001', 'ses-001', 'eyetracker');
+    behDir = fullfile(cfg.dir.output, 'source', 'sub-001', 'ses-001', 'beh');
 
     eventFilename = ['sub-001_ses-001_task-testTask_run-001_events_date-'...
         cfg.fileName.date '.tsv'];
@@ -36,9 +28,6 @@ function test_createFilenameBasic()
     % make sure the beh dir is created
     assertTrue(exist(behDir, 'dir') == 7);
 
-    % make sure the eyetracker dir is not created
-    assertTrue(exist(eyetrackerDir, 'dir') == 0);
-
     % make sure the events filename is created
     assertEqual(cfg.fileName.events, eventFilename);
 
@@ -49,17 +38,9 @@ function test_createFilenameBasic()
 
 function test_createFilenameMriEyetracker()
 
-    outputDir = fullfile(fileparts(mfilename('fullpath')), '..', 'output');
-
     %% set up
 
-    cfg.verbose = true;
-    cfg.subject.subjectGrp = 'ctrl';
-    cfg.subject.subjectNb = 2;
-    cfg.subject.sessionNb = 2;
-    cfg.subject.runNb = 2;
-    cfg.task.name = 'test task';
-    cfg.dir.output = outputDir;
+    cfg = setUp();
 
     cfg.eyeTracker.do = true;
     cfg.testingDevice = 'mri';
@@ -68,16 +49,17 @@ function test_createFilenameMriEyetracker()
 
     %% data to test against
 
-    funcDir = fullfile(outputDir, 'source', 'sub-ctrl002', 'ses-002', 'func');
+    funcDir = fullfile(cfg.dir.output, 'source', 'sub-001', 'ses-001', 'func');
 
-    eyetrackerDir = fullfile(outputDir, 'source', 'sub-ctrl002', 'ses-002', 'eyetracker');
+    eyetrackerDir = fullfile(cfg.dir.output, 'source', 'sub-001', 'ses-001', 'func');
 
-    baseFilename = 'sub-ctrl002_ses-002_task-testTask';
+    baseFilename = 'sub-001_ses-001_task-testTask';
 
-    eventFilename = ['sub-ctrl002_ses-002_task-testTask_run-002_events_date-' ...
+    eventFilename = ['sub-001_ses-001_task-testTask_run-001_events_date-' ...
         cfg.fileName.date '.tsv'];
 
-    eyetrackerFilename =  ['sub-ctrl002_ses-002_task-testTask_run-002_eyetrack_date-' ...
+    eyetrackerFilename =  [ ...
+        'sub-001_ses-001_task-testTask_run-001_recording-eyetracking_physio_date-' ...
         cfg.fileName.date '.edf'];
 
     %% tests
@@ -96,38 +78,35 @@ function test_createFilenameMriEyetracker()
 
 function test_createFilenameMriSuffix()
 
-    outputDir = fullfile(fileparts(mfilename('fullpath')), '..', 'output');
-
     %% set up
 
-    cfg.verbose = true;
-    cfg.subject.subjectGrp = 'ssri';
-    cfg.subject.subjectNb = 3;
-    cfg.subject.sessionNb = 4;
-    cfg.subject.runNb = 5;
-    cfg.task.name = 'rest';
-    cfg.dir.output = outputDir;
+    cfg = setUp();
 
-    cfg.eyeTracker.do = false;
     cfg.testingDevice = 'mri';
 
-    cfg.mri.reconstruction = 'fast recon';
-    cfg.mri.contrastEnhancement = 'test';
-    cfg.mri.phaseEncodingDirection = 'y pos';
-    cfg.mri.echo = '1';
-    cfg.mri.acquisition = ' new tYpe';
+    cfg.suffix.recording = 'respi pulse';
+    cfg.suffix.reconstruction = 'fast recon';
+    cfg.suffix.contrastEnhancement = 'test';
+    cfg.suffix.phaseEncodingDirection = 'y pos';
+    cfg.suffix.echo = '1';
+    cfg.suffix.acquisition = ' new tYpe';
 
     cfg = createFilename(cfg);
 
     %% data to test against
 
-    funcDir = fullfile(outputDir, 'source', 'sub-ssri003', 'ses-004', 'func');
+    funcDir = fullfile(cfg.dir.output, 'source', 'sub-001', 'ses-001', 'func');
+
+    baseFilename = 'sub-001_ses-001_task-testTask';
 
-    baseFilename = 'sub-ssri003_ses-004_task-rest';
+    eventFilename = ['sub-001_ses-001_task-testTask',  ...
+        '_acq-newTYpe_ce-test_dir-yPos_rec-fastRecon', ...
+        '_run-001_echo-1_events_date-' ...
+        cfg.fileName.date '.tsv'];
 
-    eventFilename = ['sub-ssri003_ses-004_task-rest',  ...
+    stimFilename = ['sub-001_ses-001_task-testTask',  ...
         '_acq-newTYpe_ce-test_dir-yPos_rec-fastRecon', ...
-        '_run-005_echo-1_events_date-' ...
+        '_run-001_echo-1_recording-respiPulse_stim_date-' ...
         cfg.fileName.date '.tsv'];
 
     %% tests
@@ -137,32 +116,170 @@ function test_createFilenameMriSuffix()
     % make sure the right filenames are created
     assertEqual(cfg.fileName.base, baseFilename);
     assertEqual(cfg.fileName.events, eventFilename);
+    assertEqual(cfg.fileName.stim, stimFilename);
 
 end
 
-function test_createFilenameEeg()
+function test_createFilenameBehSuffix()
 
-    outputDir = fullfile(fileparts(mfilename('fullpath')), '..', 'output');
+    %% set up
+
+    cfg = setUp();
+
+    cfg.testingDevice = 'pc';
+
+    cfg.suffix.recording = 'respi pulse';
+    cfg.suffix.reconstruction = 'fast recon';
+    cfg.suffix.contrastEnhancement = 'test';
+    cfg.suffix.phaseEncodingDirection = 'y pos';
+    cfg.suffix.echo = '1';
+    cfg.suffix.acquisition = ' new tYpe';
+
+    cfg = createFilename(cfg);
+
+    %% data to test against
+
+    funcDir = fullfile(cfg.dir.output, 'source', 'sub-001', 'ses-001', 'beh');
+
+    baseFilename = 'sub-001_ses-001_task-testTask';
+
+    eventFilename = ['sub-001_ses-001_task-testTask',  ...
+        '_acq-newTYpe', ...
+        '_run-001_events_date-' ...
+        cfg.fileName.date '.tsv'];
+
+    stimFilename = ['sub-001_ses-001_task-testTask',  ...
+        '_acq-newTYpe', ...
+        '_run-001_recording-respiPulse_stim_date-' ...
+        cfg.fileName.date '.tsv'];
+
+    %% tests
+    % make sure the func dir is created
+    assertTrue(exist(funcDir, 'dir') == 7);
+
+    % make sure the right filenames are created
+    assertEqual(cfg.fileName.base, baseFilename);
+    assertEqual(cfg.fileName.events, eventFilename);
+    assertEqual(cfg.fileName.stim, stimFilename);
+
+end
+
+function test_createFilenameEegSuffix()
 
     %% set up
 
-    cfg.verbose = true;
-    cfg.subject.subjectGrp = 'blind';
-    cfg.subject.subjectNb = 3;
-    cfg.subject.sessionNb = 1;
-    cfg.subject.runNb = 1;
-    cfg.task.name = 'test task';
-    cfg.dir.output = outputDir;
+    cfg = setUp();
 
     cfg.testingDevice = 'eeg';
 
+    cfg.suffix.recording = 'respi pulse';
+    cfg.suffix.reconstruction = 'fast recon';
+    cfg.suffix.contrastEnhancement = 'test';
+    cfg.suffix.phaseEncodingDirection = 'y pos';
+    cfg.suffix.echo = '1';
+    cfg.suffix.acquisition = ' new tYpe';
+
     cfg = createFilename(cfg);
 
     %% data to test against
-    eegDir = fullfile(outputDir, 'source', 'sub-blind003', 'ses-001', 'eeg');
+
+    funcDir = fullfile(cfg.dir.output, 'source', 'sub-001', 'ses-001', 'eeg');
+
+    baseFilename = 'sub-001_ses-001_task-testTask';
+
+    eventFilename = ['sub-001_ses-001_task-testTask',  ...
+        '_run-001_events_date-' ...
+        cfg.fileName.date '.tsv'];
+
+    stimFilename = ['sub-001_ses-001_task-testTask',  ...
+        '_run-001_recording-respiPulse_stim_date-' ...
+        cfg.fileName.date '.tsv'];
+
+    %% tests
+    % make sure the func dir is created
+    assertTrue(exist(funcDir, 'dir') == 7);
+
+    % make sure the right filenames are created
+    assertEqual(cfg.fileName.base, baseFilename);
+    assertEqual(cfg.fileName.events, eventFilename);
+    assertEqual(cfg.fileName.stim, stimFilename);
+
+end
+
+function test_createFilenameEeg()
+
+    %% set up
+
+    cfg = setUp();
+
+    cfg.testingDevice = 'eeg';
+
+    cfg = createFilename(cfg);
+
+    %% data to test against
+    eegDir = fullfile(cfg.dir.output, 'source', 'sub-001', 'ses-001', 'eeg');
+
+    eventFilename = ['sub-001_ses-001_task-testTask_run-001_events_date-'...
+        cfg.fileName.date '.tsv'];
 
     %% test
     % make sure the func dir is created
     assertTrue(exist(eegDir, 'dir') == 7);
 
+    % make sure the events filename is created
+    assertEqual(cfg.fileName.events, eventFilename);
+
+end
+
+function test_createFilenameIeeg()
+
+    %% set up
+
+    cfg = setUp();
+
+    cfg.testingDevice = 'ieeg';
+
+    cfg = createFilename(cfg);
+
+    %% data to test against
+    ieegDir = fullfile(cfg.dir.output, 'source', 'sub-001', 'ses-001', 'ieeg');
+
+    %% test
+    % make sure the func dir is created
+    assertTrue(exist(ieegDir, 'dir') == 7);
+
+    eventFilename = ['sub-001_ses-001_task-testTask_run-001_events_date-'...
+        cfg.fileName.date '.tsv'];
+
+end
+
+function test_createFilenameMeg()
+
+    %% set up
+
+    cfg = setUp();
+
+    cfg.testingDevice = 'meg';
+
+    cfg = createFilename(cfg);
+
+    %% data to test against
+    megDir = fullfile(cfg.dir.output, 'source', 'sub-001', 'ses-001', 'meg');
+
+    %% test
+    % make sure the func dir is created
+    assertTrue(exist(megDir, 'dir') == 7);
+
+    eventFilename = ['sub-001_ses-001_task-testTask_run-001_events_date-'...
+        cfg.fileName.date '.tsv'];
+
+end
+
+function cfg = setUp()
+    outputDir = fullfile(fileparts(mfilename('fullpath')), '..', 'output');
+    cfg.verbose = true;
+    cfg.subject.subjectNb = 1;
+    cfg.subject.runNb = 1;
+    cfg.task.name = 'test task';
+    cfg.dir.output = outputDir;
 end
diff --git a/tests/test_createJson.m b/tests/test_createJson.m
new file mode 100644
index 00000000..aace3715
--- /dev/null
+++ b/tests/test_createJson.m
@@ -0,0 +1,140 @@
+function test_suite = test_createJson %#ok<*STOUT>
+    try % assignment of 'localfunctions' is necessary in Matlab >= 2016
+        test_functions = localfunctions(); %#ok<*NASGU>
+    catch % no problem; early Matlab versions can use initTestSuite fine
+    end
+    initTestSuite;
+end
+
+function test_createJsonFunc()
+
+    %% set up
+    cfg = setUp();
+
+    cfg.testingDevice = 'mri';
+
+    cfg = createFilename(cfg);
+
+    logFile = saveEventsFile('init', cfg); %#ok<*NASGU>
+
+    createJson(cfg);
+
+    %% data to test against
+    funcDir = fullfile(cfg.dir.output, 'source', 'sub-001', 'ses-001', 'func');
+
+    eventFilename = ['sub-001_ses-001_task-testtask_run-001_bold_date-' ...
+        cfg.fileName.date '.json'];
+
+    %% test
+    assertTrue(exist(fullfile(funcDir, eventFilename), 'file') == 2);
+
+end
+
+function test_createJsonBeh()
+
+    %% set up
+    cfg = setUp();
+
+    cfg.testingDevice = 'pc';
+
+    cfg = createFilename(cfg);
+
+    logFile = saveEventsFile('init', cfg); %#ok<*NASGU>
+
+    createJson(cfg);
+
+    %% data to test against
+    funcDir = fullfile(cfg.dir.output, 'source', 'sub-001', 'ses-001', 'beh');
+
+    eventFilename = ['sub-001_ses-001_task-testtask_run-001_beh_date-' ...
+        cfg.fileName.date '.json'];
+
+    %% test
+    assertTrue(exist(fullfile(funcDir, eventFilename), 'file') == 2);
+
+end
+
+function test_createJsonEeg()
+
+    %% set up
+    cfg = setUp();
+
+    cfg.testingDevice = 'eeg';
+
+    cfg = createFilename(cfg);
+
+    logFile = saveEventsFile('init', cfg); %#ok<*NASGU>
+
+    createJson(cfg);
+
+    %% data to test against
+    funcDir = fullfile(cfg.dir.output, 'source', 'sub-001', 'ses-001', 'eeg');
+
+    eventFilename = ['sub-001_ses-001_task-testtask_run-001_eeg_date-' ...
+        cfg.fileName.date '.json'];
+
+    %% test
+    assertTrue(exist(fullfile(funcDir, eventFilename), 'file') == 2);
+
+end
+
+function test_createJsonMeg()
+
+    %% set up
+    cfg = setUp();
+
+    cfg.testingDevice = 'meg';
+
+    cfg = createFilename(cfg);
+
+    logFile = saveEventsFile('init', cfg); %#ok<*NASGU>
+
+    createJson(cfg);
+
+    %% data to test against
+    funcDir = fullfile(cfg.dir.output, 'source', 'sub-001', 'ses-001', 'meg');
+
+    eventFilename = ['sub-001_ses-001_task-testtask_run-001_meg_date-' ...
+        cfg.fileName.date '.json'];
+
+    %% test
+    assertTrue(exist(fullfile(funcDir, eventFilename), 'file') == 2);
+
+end
+
+function test_createJsonIeeg()
+
+    %% set up
+    cfg = setUp();
+
+    cfg.testingDevice = 'ieeg';
+
+    cfg = createFilename(cfg);
+
+    logFile = saveEventsFile('init', cfg); %#ok<*NASGU>
+
+    createJson(cfg);
+
+    %% data to test against
+    funcDir = fullfile(cfg.dir.output, 'source', 'sub-001', 'ses-001', 'ieeg');
+
+    eventFilename = ['sub-001_ses-001_task-testtask_run-001_ieeg_date-' ...
+        cfg.fileName.date '.json'];
+
+    %% test
+    assertTrue(exist(fullfile(funcDir, eventFilename), 'file') == 2);
+
+end
+
+function cfg = setUp()
+
+    cfg.verbose = false;
+
+    cfg.subject.subjectNb = 1;
+    cfg.subject.runNb = 1;
+
+    cfg.task.name = 'testtask';
+
+    cfg.dir.output = fullfile(fileparts(mfilename('fullpath')), '..', 'output');
+
+end
diff --git a/tests/test_transferInfoToBids.m b/tests/test_transferInfoToBids.m
index 3ba4fdd6..555331a0 100644
--- a/tests/test_transferInfoToBids.m
+++ b/tests/test_transferInfoToBids.m
@@ -23,13 +23,22 @@ function test_transferInfoToBidsTaskname()
     % make sure the file name gets trasnferred where it should
 
     cfg.task.name = 'foo bar';
+    cfg.task.instructions = 'do this';
 
     fieldsToSet = struct();
     fieldsToSet = transferInfoToBids(fieldsToSet, cfg);
 
     expectedStruct.fileName.task = 'fooBar';
     expectedStruct.bids.meg.TaskName = 'foo Bar';
+    expectedStruct.bids.eeg.TaskName = 'foo Bar';
+    expectedStruct.bids.ieeg.TaskName = 'foo Bar';
+    expectedStruct.bids.beh.TaskName = 'foo Bar';
     expectedStruct.bids.mri.TaskName = 'foo Bar';
+    expectedStruct.bids.meg.Instructions = 'do this';
+    expectedStruct.bids.eeg.Instructions = 'do this';
+    expectedStruct.bids.ieeg.Instructions = 'do this';
+    expectedStruct.bids.beh.Instructions = 'do this';
+    expectedStruct.bids.mri.Instructions = 'do this';
 
     assert(isequal(expectedStruct, fieldsToSet));