diff --git a/+ndi/+daq/+system/mfdaq.m b/+ndi/+daq/+system/mfdaq.m
index 886f40555..3ad7e6d74 100755
--- a/+ndi/+daq/+system/mfdaq.m
+++ b/+ndi/+daq/+system/mfdaq.m
@@ -312,7 +312,6 @@
                     channeltype, channel, ndi_daqsystem_mfdaq_obj.session());
             end;
         end;
-
     end; % methods
 
     methods (Static), % functions that don't need the object
diff --git a/+ndi/+daq/templates/daq_reader.mtemplate b/+ndi/+daq/templates/daq_reader.mtemplate
new file mode 100644
index 000000000..4b0b240e9
--- /dev/null
+++ b/+ndi/+daq/templates/daq_reader.mtemplate
@@ -0,0 +1,5 @@
+classdef {{ReaderClassName}} < {{ReaderSuperClass}}
+
+
+
+end
\ No newline at end of file
diff --git a/+ndi/+daq/templates/daq_reader_variables.json b/+ndi/+daq/templates/daq_reader_variables.json
new file mode 100644
index 000000000..ba7aed104
--- /dev/null
+++ b/+ndi/+daq/templates/daq_reader_variables.json
@@ -0,0 +1,4 @@
+{
+    "ReaderClassName": "",
+    "ReaderSuperClass": ""
+}
\ No newline at end of file
diff --git a/+ndi/+database/+app/+dataset_viewer/DatasetViewer.mlapp b/+ndi/+database/+app/+dataset_viewer/DatasetViewer.mlapp
index 242c2fd3b..227f5d931 100644
Binary files a/+ndi/+database/+app/+dataset_viewer/DatasetViewer.mlapp and b/+ndi/+database/+app/+dataset_viewer/DatasetViewer.mlapp differ
diff --git a/+ndi/+database/+metadata_ds_core/+conversion/+internal/createInstance.m b/+ndi/+database/+metadata_ds_core/+conversion/+internal/createInstance.m
new file mode 100644
index 000000000..c3169680f
--- /dev/null
+++ b/+ndi/+database/+metadata_ds_core/+conversion/+internal/createInstance.m
@@ -0,0 +1,49 @@
+function openMindsInstance = createInstance(dataStruct, openMindsType)
+    
+    arguments
+        dataStruct (1,1) struct
+        openMindsType (1,1) string
+    end
+
+    try
+        conversionFunctionMap = getConcreteConversionMap(openMindsType);
+    catch
+        conversionFunctionMap = struct;
+    end
+
+    openMindsInstance = feval( openMindsType );
+    dataFields = fieldnames(dataStruct);
+
+    for i = 1:numel(dataFields)
+        [fieldName, propName] = deal( dataFields{i} );
+        propName(1) = lower(propName(1));
+
+        value = dataStruct.(fieldName);
+        if isempty(value); continue; end % Skip conversion for empty values
+
+        if isa(value, 'char'); value = string(value); end
+
+        if isfield( conversionFunctionMap, propName )
+
+            conversionFcn = conversionFunctionMap.(propName);
+
+            if iscell(value)
+                value = cellfun(@(s) conversionFcn(s), value);
+
+            elseif numel(value) > 1 % array conversion
+                value = arrayfun(@(s) conversionFcn(s), value);
+
+            else
+                value = conversionFcn(value);
+            end
+        else
+            % Insert value directly
+        end
+
+        try
+            openMindsInstance.(propName) = value;
+        catch ME
+            % warning(ME.message)
+        end
+    end
+end
diff --git a/+ndi/+database/+metadata_ds_core/+conversion/convertStrains.m b/+ndi/+database/+metadata_ds_core/+conversion/convertStrains.m
new file mode 100644
index 000000000..29c003310
--- /dev/null
+++ b/+ndi/+database/+metadata_ds_core/+conversion/convertStrains.m
@@ -0,0 +1,28 @@
+function [strainInstanceMap] = convertStrains(items)
+
+    import ndi.database.metadata_ds_core.conversion.internal.createInstance
+    
+    strainInstanceMap = containers.Map();
+
+    % Convert items without background strains
+    for i = 1:numel(items)
+        thisItem = items(i);
+        thisItem = rmfield(thisItem, 'backgroundStrain');
+
+        thisInstance = createInstance(thisItem, 'openminds.core.Strain');
+
+        strainInstanceMap(thisItem.name) = thisInstance;
+    end
+
+    % "Recursively" link together background strains
+    for i = 1:numel(items)
+        thisItem = items(i);
+        thisInstance = strainInstanceMap(thisItem.name);
+
+        for j = 1:numel(thisItem.backgroundStrain)
+            bgStrainName = thisItem.backgroundStrain(j);
+            bgInstance = strainInstanceMap(bgStrainName);
+            thisInstance.backgroundStrain(j) = bgInstance;
+        end
+    end
+end
diff --git a/+ndi/+database/+metadata_ds_core/+conversion/getAllStrains.m b/+ndi/+database/+metadata_ds_core/+conversion/getAllStrains.m
new file mode 100644
index 000000000..87dd75cb6
--- /dev/null
+++ b/+ndi/+database/+metadata_ds_core/+conversion/getAllStrains.m
@@ -0,0 +1,10 @@
+function strainInstanceMap = getAllStrains()
+
+    import ndi.database.metadata_app.fun.loadUserInstanceCatalog
+    import ndi.database.metadata_ds_core.conversion.convertStrains
+
+    strainCatalog = loadUserInstanceCatalog('Strain');
+
+    % Todo: Adapt conversion to also convert custom species.
+    strainInstanceMap = convertStrains(strainCatalog.getAll() );
+end
diff --git a/+ndi/+dataset/+gui/+enum/FolderLevelType.m b/+ndi/+dataset/+gui/+enum/FolderLevelType.m
new file mode 100644
index 000000000..298c0ba40
--- /dev/null
+++ b/+ndi/+dataset/+gui/+enum/FolderLevelType.m
@@ -0,0 +1,28 @@
+classdef FolderLevelType
+    
+    enumeration
+        Undefined('Undefined')
+        Subject('Subject')
+        Session('Session')
+        Trial('Trial')
+        Date('Date')
+        Epoch('Epoch')
+    end
+
+    properties
+        Name
+        DefaultFolderPrefix
+    end
+
+    methods
+        function obj = FolderLevelType(name)
+            obj.Name = name;
+            switch obj.Name
+                case 'Subject'
+                    obj.DefaultFolderPrefix = 'subject';
+                case 'Session'
+                    obj.DefaultFolderPrefix = 'session';
+            end
+        end
+    end
+end
\ No newline at end of file
diff --git a/+ndi/+dataset/+gui/+event/UserActionEventData.m b/+ndi/+dataset/+gui/+event/UserActionEventData.m
new file mode 100644
index 000000000..c83d64533
--- /dev/null
+++ b/+ndi/+dataset/+gui/+event/UserActionEventData.m
@@ -0,0 +1,11 @@
+classdef UserActionEventData < event.EventData
+    properties
+        UserAction
+    end
+    
+    methods
+        function obj = UserActionEventData(userAction)
+            obj.UserAction = userAction;
+        end
+    end
+end
diff --git a/+ndi/+dataset/+gui/+folderorganization/+widget/FolderOrganizationTableToolbar.mlapp b/+ndi/+dataset/+gui/+folderorganization/+widget/FolderOrganizationTableToolbar.mlapp
new file mode 100644
index 000000000..d16e27ba2
Binary files /dev/null and b/+ndi/+dataset/+gui/+folderorganization/+widget/FolderOrganizationTableToolbar.mlapp differ
diff --git a/+ndi/+dataset/+gui/+folderorganization/FolderOrganizationModel.m b/+ndi/+dataset/+gui/+folderorganization/FolderOrganizationModel.m
new file mode 100644
index 000000000..e69de29bb
diff --git a/+ndi/+dataset/+gui/+folderorganization/FolderOrganizationPage.m b/+ndi/+dataset/+gui/+folderorganization/FolderOrganizationPage.m
new file mode 100644
index 000000000..d3df32221
--- /dev/null
+++ b/+ndi/+dataset/+gui/+folderorganization/FolderOrganizationPage.m
@@ -0,0 +1,294 @@
+classdef FolderOrganizationPage < ndi.gui.window.wizard.abstract.Page
+
+% Todo:
+%   Pass button through the subfolder preview functions?
+
+    properties (Constant)
+        Name = "Subfolders"
+        Title = "Folder Organization"
+        Description = "Specify how subfolders are organized"
+    end
+
+    properties % UI Data % TODO: move to model?
+        RootDirectory
+        PresetFolderModels (1,1) dictionary
+    end
+ 
+    properties % Model - View - Controller (MVC pattern)
+        DataModel (1,1) ndi.dataset.gui.models.FolderOrganizationModel
+        View (1,1) ndi.dataset.gui.folderorganization.FolderOrganizationTableView
+        Controller (1,1) ndi.dataset.gui.folderorganization.FolderOrganizationTableController
+    end
+
+    properties (Access = private) % Custom UI Components
+        UITable %ndi.dataset.gui.pages.component.FolderOrganizationTable
+        UIToolbar ndi.dataset.gui.pages.component.FolderOrganizationToolbar % move to controller...
+        TableGridLayout
+    end
+
+    properties (Access = private) % Generic UI Components
+        ContextMenu
+        SaveMenu
+        LoadMenu
+    end
+
+    properties (Access = private)
+        FolderListViewer
+        FolderListViewerActive = false
+        FolderOrganizationFilterListener
+    end
+
+    methods
+        function obj = FolderOrganizationPage( )
+            obj.DoCreatePanel = true;
+        end
+    end
+
+    methods
+        function set.DataModel(obj, dataModel)
+            obj.DataModel = dataModel;
+            if obj.IsInitialized
+                % Todo: update differently....
+                obj.View.update() %#ok<MCSUP>
+            end
+        end
+
+        function set.RootDirectory(obj, rootDirectory)
+            obj.RootDirectory = rootDirectory;
+            if obj.IsInitialized
+                % Todo(?) Update data model root directory
+            end
+        end
+
+        function set.PresetFolderModels(obj, value)
+            obj.PresetFolderModels = value;
+            obj.postSetPresetFolderModels()
+        end
+    end
+
+    methods (Access = private)
+        function postSetPresetFolderModels(obj)
+            if ~isempty( obj.UIToolbar ) 
+                obj.UIToolbar.PresetFolderModels = keys(obj.PresetFolderModels);
+            end
+        end
+    end
+
+    methods (Access = protected)
+
+        function onVisiblePropertyValueSet(obj)
+            onVisiblePropertyValueSet@ndi.gui.window.wizard.abstract.Page(obj)
+
+            if ~isempty(obj.UIToolbar)
+                obj.UIToolbar.Visible = obj.Visible;
+            end
+        end
+
+        function onPageEntered(obj)
+            % No action needed
+        end
+
+        function onPageExited(obj)
+            % Todo: Close folder viewer if it is open.
+        end
+
+        function createComponents(obj)
+        % createComponents - Create components for page.   
+
+            defaultTableData = obj.DataModel.getDefaultFolderLevelTable();
+
+            obj.TableGridLayout = uigridlayout(obj.UIPanel);
+            obj.TableGridLayout.ColumnWidth={'1x'};
+            obj.TableGridLayout.RowHeight={'1x'};
+            obj.TableGridLayout.Padding = [20,0,20,0];
+            obj.TableGridLayout.BackgroundColor = 'w';
+
+            parent = obj.TableGridLayout;
+            %parent = obj.UIPanel;
+
+            obj.UITable = WidgetTable(parent, 'ItemName', 'Folder Level');
+            obj.UITable.HeaderBackgroundColor = "#FFFFFF";
+            obj.UITable.HeaderForegroundColor = "#002054";
+            obj.UITable.BackgroundColor = 'w';
+            obj.UITable.ColumnNames = defaultTableData.Properties.CustomProperties.VariableTitle;
+            obj.UITable.ColumnWidth = {185, 175, 150, 150};
+            %obj.UITable.ColumnWidget = {'', '', '', customColumnFcn};
+            obj.UITable.TableBorderType = 'none';
+            obj.UITable.MinimumColumnWidth = 120;
+            obj.UITable.ColumnHeaderHelpFcn = @ndi.dataset.gui.getTooltipMessage;
+            
+            obj.UITable.setDefaultRowData(defaultTableData)
+            
+            obj.View = ndi.dataset.gui.folderorganization.FolderOrganizationTableView(obj.DataModel, obj.UITable);
+            obj.Controller = ndi.dataset.gui.folderorganization.FolderOrganizationTableController(obj.DataModel, obj.UITable);
+            obj.View.update()
+
+            obj.UIToolbar = ndi.dataset.gui.pages.component.FolderOrganizationToolbar(obj.ParentApp.BodyGridLayout);
+            obj.UIToolbar.Layout.Row = 2;
+            obj.UIToolbar.Layout.Column = 1;
+            obj.UIToolbar.Theme = obj.ParentApp.Theme;
+            
+            % Set callback functions
+            obj.UIToolbar.MenuButtonPushedFcn = @obj.onMenuButtonPushed;
+            obj.UIToolbar.ShowFiltersButtonPushedFcn = @obj.onShowFiltersButtonPushed;
+            obj.UIToolbar.PreviewButtonPushedFcn = @obj.onFolderPreviewButtonClicked;
+            obj.UIToolbar.SelectTemplateDropDownValueChangedFcn = @obj.onPresetTemplateSelected;
+
+            % Todo: (allow saving a model as a template?)
+            % Note: This could be a menu on a button next to the template
+            % dropdown
+            obj.ContextMenu = uicontextmenu(obj.ParentApp.UIFigure);
+
+            obj.SaveMenu = uimenu(obj.ContextMenu);
+            obj.SaveMenu.Text = 'Save to template file';
+
+            obj.LoadMenu = uimenu(obj.ContextMenu);
+            obj.LoadMenu.Text = 'Load from template file';
+
+            % Do this last.
+            obj.loadPresetFolderModels()
+        end
+
+        function onMenuButtonPushed(obj, event)
+            pos = getpixelposition(event.Source, true);
+            obj.ContextMenu.open(pos(1)+12, pos(2)-5)
+        end
+        
+        function onShowFiltersButtonPushed(obj, event)
+            if event.Value
+                obj.View.showAdvancedOptions();
+                %obj.UITable.showAdvancedOptions()
+            else
+                obj.View.hideAdvancedOptions();
+                %obj.UITable.hideAdvancedOptions()
+            end
+        end
+        
+        function onFolderPreviewButtonClicked(obj, event)
+        %onFolderPreviewButtonClicked Button callback
+        %
+        %   This callback toggles visibility a figure that displays all the
+        %   folders that are detected using current configuration
+        
+            if ~isempty(obj.FolderListViewer) && isvalid(obj.FolderListViewer)
+                if strcmp(obj.FolderListViewer.Visible, 'on')
+                    obj.FolderListViewerActive = false;
+                    obj.hideFolderListViewer()
+                    event.Source.FontWeight = 'normal';
+                elseif strcmp(obj.FolderListViewer.Visible, 'off')
+                    obj.FolderListViewerActive = true;
+                    obj.showFolderListViewer()
+                    event.Source.FontWeight = 'bold';
+                end
+            else
+                obj.FolderListViewerActive = true;
+                obj.showFolderListViewer()
+                event.Source.FontWeight = 'bold';
+            end
+        end
+
+        function onPresetTemplateSelected(obj, event)
+            filePath = obj.PresetFolderModels( event.Value );
+            templateFolderModel = ndi.dataset.gui.models.FolderOrganizationModel.fromJson(filePath);
+            
+            oldFolderLevels = obj.DataModel.FolderLevels;
+            newFolderLevels = templateFolderModel.FolderLevels;
+           
+            % Update names based on current selections
+            for i = 1:numel(newFolderLevels)
+                if i <= numel(oldFolderLevels)
+                    newFolderLevels(i).Name = oldFolderLevels(i).Name;
+                end
+            end
+
+            obj.DataModel.FolderLevels = newFolderLevels;
+
+            obj.View.update()
+        end
+    end
+
+    % % % % Methods for the folder listing figure and table
+    methods (Access = private) 
+
+        function createFolderListViewer(obj)
+
+            obj.FolderListViewer = nansen.config.dloc.FolderPathViewer(obj.ParentApp.UIFigure);
+            obj.FolderListViewer.Theme = obj.ParentApp.Theme;
+            
+            addlistener(obj.FolderListViewer, 'ObjectBeingDestroyed', ...
+                @(s, e) obj.onFolderListViewerDeleted);
+            
+            obj.FolderOrganizationFilterListener = listener(obj.DataModel, ...
+                'FolderModelChanged', @(s,e) obj.updateFolderList);
+            
+            % Give focus to the app figure
+            figure(obj.ParentApp.UIFigure)
+        end
+    
+        function showFolderListViewer(obj)
+                        
+            [screenSize, ~] = ndi.gui.utility.getCurrentScreenSize(obj.ParentApp.UIFigure);
+            obj.ParentApp.UIFigure.Position(1) = screenSize(1) + 10;
+
+            if isempty(obj.FolderListViewer) || ~isvalid(obj.FolderListViewer)
+                obj.createFolderListViewer()
+                obj.updateFolderList()
+            end
+            
+            %obj.PreviewButton.ImageSource = nansen.internal.getIconPathName('look3.png');
+            obj.FolderListViewer.Visible = 'on';
+            pause(0.01)
+            
+            if ~isempty(obj.ParentApp.UIFigure)
+                figure(obj.ParentApp.UIFigure)
+            end
+        end
+                
+        function hideFolderListViewer(obj)
+            
+            if ~isempty(obj.FolderListViewer) && isvalid(obj.FolderListViewer)
+                %obj.PreviewButton.ImageSource = nansen.internal.getIconPathName('look2.png');
+                obj.FolderListViewer.Visible = 'off';
+
+                if ~isempty(obj.ParentApp.UIFigure)
+                    ndi.gui.utility.centerFigureOnScreen(obj.ParentApp.UIFigure)
+                end
+            end
+        end
+        
+        function onFolderListViewerDeleted(obj)
+            if ~isvalid(obj); return; end
+            
+            obj.FolderListViewerActive = false;
+            %obj.PreviewButton.ImageSource = nansen.internal.getIconPathName('look2.png');
+            obj.FolderListViewer = [];
+        end
+
+        function updateFolderList(obj)
+        
+            if isempty(obj.FolderListViewer) || ~isvalid(obj.FolderListViewer)
+                return
+            end
+
+            folderPath = obj.DataModel.listAllFolders();
+
+            if isempty(folderPath); folderPath = {''}; end
+            
+            % Remove the root path from the displayed paths.
+            folderPath = strrep(folderPath, obj.RootDirectory, sprintf('<Dataset>'));
+            
+            % Update table data in folderlist viewer
+            obj.FolderListViewer.Data = folderPath';
+        end
+
+        function loadPresetFolderModels(obj)
+            rootDirectory = fileparts( fileparts (mfilename('fullpath') ) );
+            L = dir( fullfile(rootDirectory, 'resources', 'preset', '*.json') );
+
+            for i = 1:numel(L)
+                [~, name] = fileparts(L(i).name);
+                obj.PresetFolderModels(name) = fullfile(L(i).folder, L(i).name);
+            end
+        end
+    end
+end
\ No newline at end of file
diff --git a/+ndi/+dataset/+gui/+folderorganization/FolderOrganizationTableController.m b/+ndi/+dataset/+gui/+folderorganization/FolderOrganizationTableController.m
new file mode 100644
index 000000000..e214c8d08
--- /dev/null
+++ b/+ndi/+dataset/+gui/+folderorganization/FolderOrganizationTableController.m
@@ -0,0 +1,106 @@
+classdef FolderOrganizationTableController < handle
+% FolderOrganizationTableController - Controller class for folder organization table
+%
+%   This class should respond to a user's actions in the FolderOrganization
+%   page and update the FolderOrganization model accordingly.
+
+% Todo: 
+%   [ ] Create the table toolbar and also assign its callbacks. 
+%   [ ] Store the view handle as a controller property
+
+
+    properties (Access = private)
+        % UITable - Handle object of the UITable representing the folder levels
+        UITable
+    end
+
+    properties (Access = private)
+        % DataModel - Handle of a FolderOrganizationModel object.
+        DataModel
+    end
+
+    methods % Constructor
+        function obj = FolderOrganizationTableController(dataModel, uiTable)
+            if ~nargin; return; end
+            
+            % Assign controller dependencies
+            obj.DataModel = dataModel;
+            obj.UITable = uiTable;
+
+            % Assign controller callbacks
+            obj.UITable.CellEditedFcn = @obj.onTableCellValueChanged;
+            obj.UITable.AddRowFcn = @obj.onAddSubfolderLevelButtonPushed;
+            obj.UITable.RowRemovedFcn = @obj.onSubfolderLevelRemoved;
+        end
+    end
+
+    methods (Access = private)
+        % Callback handler for value change in FolderLevel table.
+        function onTableCellValueChanged(obj, ~, evt)
+            rowInd = evt.Indices(1);
+            varName = evt.ColumnName;
+            newValue = evt.NewData;
+
+            % Process input
+            switch varName
+                case 'Expression'
+                    newValue = numbersign2expression(evt.NewData);
+
+                case 'IgnoreList'
+                    newValue = strtrim( strsplit(newValue, ',') );
+                    newValue = newValue(~cellfun('isempty', newValue));
+                    newValue = string(newValue);
+                
+                case 'Name' % Make sure "placeholder" value does not end up in model
+                    if strcmp(newValue, '<Select a Folder>')
+                        newValue = '';
+                    end
+            end
+
+            obj.DataModel.updateFolderLevel(rowInd, varName, newValue)
+        end
+
+        % Callback handler for button to add more subfolder levels.
+        function onAddSubfolderLevelButtonPushed(obj, ~, ~)
+            try
+                obj.DataModel.assertExistSubfolders()
+                obj.DataModel.addSubFolderLevel()
+            catch ME
+                switch ME.identifier
+                    case 'NDI:FolderModel:FolderNameIsEmpty'
+                        error('Please select a subfolder for each folder level before adding a new folder level')
+                    otherwise
+                        rethrow(ME)
+                end
+            end
+        end
+
+        % Callback handler for when subfolder is removed.
+        function onSubfolderLevelRemoved(obj, ~, evt)
+            obj.DataModel.removeSubfolderLevel(evt.RowIndex)
+        end
+    end
+end
+
+function str = numbersign2expression(str)
+% numbersign2expression - Convert number signs (#) to regexp expression
+%
+%   Example:
+%       str = test###;
+%       expr = numbersign2expression(str)
+%
+%       expr =
+%
+%           test\d{3}
+
+    assert(ischar(str), 'Input must be a character vector')
+
+    numChars = numel(str);
+    for i = numChars:-1:1
+    
+        searchStr = repmat('#', 1, i);
+        replaceStr = ['\', sprintf('d{%d}', i)];
+        
+        str = strrep(str, searchStr, replaceStr);
+    end
+end
diff --git a/+ndi/+dataset/+gui/+folderorganization/FolderOrganizationTableView.m b/+ndi/+dataset/+gui/+folderorganization/FolderOrganizationTableView.m
new file mode 100644
index 000000000..359f731d2
--- /dev/null
+++ b/+ndi/+dataset/+gui/+folderorganization/FolderOrganizationTableView.m
@@ -0,0 +1,96 @@
+classdef FolderOrganizationTableView < handle
+    
+    properties (Access = private)
+        UITable
+    end
+
+    properties (Access = private)
+        DataModel
+    end
+
+    properties (Access = private)
+        FolderModelChangedListener
+        ShowAdvancedOptions = true % Todo: Change default to false...
+    end
+
+    methods % Constructor
+        function obj = FolderOrganizationTableView(dataModel, uiTable)
+            if ~nargin; return; end
+            obj.DataModel = dataModel;
+            obj.UITable = uiTable;
+
+            % Add listeners for model events
+            obj.FolderModelChangedListener = listener(obj.DataModel, ...
+                'FolderModelChanged', @obj.onFolderModelChanged);
+        end
+    end
+
+    methods 
+        function update(obj)
+            obj.updateTableView()
+        end
+
+        function showAdvancedOptions(obj)
+            obj.ShowAdvancedOptions = true;
+            
+            obj.UITable.VisibleColumns = [true,true,true,true];
+            obj.UITable.ColumnWidth(1:2) = {185, 175};
+
+            obj.updateTableView()
+            drawnow
+            obj.UITable.redraw()
+        end
+
+        function hideAdvancedOptions(obj)
+            obj.ShowAdvancedOptions = false;
+
+            obj.UITable.VisibleColumns = [true,true,false,false];
+            obj.UITable.ColumnWidth(1:2) = {'2x', '1x'};
+
+            obj.updateTableView()
+            drawnow
+            obj.UITable.redraw()
+        end
+    end
+
+    % Callback functions handling folder model events
+    methods (Access = private)
+        function onFolderModelChanged(obj, src, evt)
+            obj.updateTableView()
+        end
+    end
+
+    methods (Access = private)
+        function updateTableView(obj)
+            S = obj.DataModel.getFolderLevelStruct();
+            if isempty(S); return; end
+
+            for i = 1:numel(S)
+                subFolderOptions = obj.DataModel.listFoldersAtDepth(i);
+                subFolderOptions = [{'<Select a Folder>'}, subFolderOptions]; %#ok<AGROW>
+
+                if isempty(char(S(i).Name))
+                    S(i).Name = subFolderOptions{1};
+                elseif ~any(strcmp(S(i).Name, subFolderOptions))
+                    S(i).Name = subFolderOptions{1};
+                end
+                S(i).Name = categorical({char(S(i).Name)}, subFolderOptions);
+
+                % Update ignorelist to comma separated char
+                S(i).IgnoreList = strjoin( S(i).IgnoreList, ', ');
+            end
+
+            if ~obj.ShowAdvancedOptions
+                %S = rmfield(S, {'Expression', 'IgnoreList'});
+            end
+
+            % Assign the struct array as the tables data...
+            obj.UITable.updateData(S)
+
+            % Only allow removal of the last folder level.
+            numFolderLevels = numel(obj.DataModel.FolderLevels);
+            obj.UITable.disableRemoveRowButton(1:numFolderLevels-1)
+            obj.UITable.enableRemoveRowButton(numFolderLevels)
+        end
+    end
+end
\ No newline at end of file
diff --git a/+ndi/+dataset/+gui/+models/DaqSystemCollection.m b/+ndi/+dataset/+gui/+models/DaqSystemCollection.m
new file mode 100644
index 000000000..e1822d469
--- /dev/null
+++ b/+ndi/+dataset/+gui/+models/DaqSystemCollection.m
@@ -0,0 +1,41 @@
+classdef DaqSystemCollection < ndi.internal.mixin.JsonSerializable
+
+    properties (Constant)
+        VERSION = "1.0.0"
+        DESCRIPTION = "NDI DAQ System Configuration Collection" % Catalog?
+    end
+
+    properties
+        DaqSystems (1,:) ndi.setup.DaqSystemConfiguration
+    end
+
+    methods % Catalog-like methods...
+        function addDaqSystem(obj)
+            obj.DaqSystems(end+1) = ndi.setup.DaqSystemConfiguration();
+
+        end
+
+        function removeDaqSystem(obj, index)
+            obj.DaqSystems(index) = [];
+        end
+    end
+
+    methods (Access = protected)
+        % function fromStruct(obj, S)
+        % 
+        % end
+
+        function tf = isInitialized(obj)
+        % isInitialized - Is data initialized?
+            tf = ~isempty(obj.DaqSystems);
+        end
+
+    end
+
+    methods (Static)
+        function obj = fromJson(jsonStr)
+            className = mfilename('class');
+            obj = fromJson@ndi.internal.mixin.JsonSerializable(jsonStr, className);
+        end
+    end
+end
\ No newline at end of file
diff --git a/+ndi/+dataset/+gui/+models/DatasetInfo.m b/+ndi/+dataset/+gui/+models/DatasetInfo.m
new file mode 100644
index 000000000..12734ebe1
--- /dev/null
+++ b/+ndi/+dataset/+gui/+models/DatasetInfo.m
@@ -0,0 +1,23 @@
+classdef DatasetInfo < handle
+
+    properties
+        DatasetTitle (1,1) string
+        DatasetRootPathLog (1,:) string
+    end
+
+    properties (SetObservable)
+        DatasetRootPath (1,1) string
+    end
+
+    methods
+        function tf = isClean(obj, filePath)
+            if isfile(filePath)
+                S = load(filePath);
+                tf = strcmp(S.DatasetInformation.DatasetTitle, obj.DatasetTitle);
+            else
+                tf = false;
+            end
+        end
+    end
+
+end
\ No newline at end of file
diff --git a/+ndi/+dataset/+gui/+models/FolderLevel.m b/+ndi/+dataset/+gui/+models/FolderLevel.m
new file mode 100644
index 000000000..bc8cfab32
--- /dev/null
+++ b/+ndi/+dataset/+gui/+models/FolderLevel.m
@@ -0,0 +1,34 @@
+classdef FolderLevel < matlab.mixin.SetGet
+
+    properties
+        Name (1,1) string = ""
+        Type (1,1) ndi.dataset.gui.enum.FolderLevelType
+        IgnoreList (1,:) string
+        Expression (1,1) string
+        FolderNamePrefix (1,1) string = ""
+    end
+
+    methods % Constructor
+        function obj = FolderLevel(propertyValues)
+            arguments
+                propertyValues.?ndi.dataset.gui.models.FolderLevel
+            end
+            obj.set(propertyValues)
+        end
+    end
+
+    methods
+        function getFolderPath(obj, rootPathName, id)
+            % Get path of subfolder given a root directory path and a folder id
+        end
+
+        function createFolder(obj, rootPathName, id)
+            % Create a subfolder in a root directory with a given id
+        end
+
+        function listFolders(obj, rootPathName)
+            % List all folders in the rootDirectory 
+        end
+    end
+
+end
\ No newline at end of file
diff --git a/+ndi/+dataset/+gui/+models/FolderOrganizationModel.m b/+ndi/+dataset/+gui/+models/FolderOrganizationModel.m
new file mode 100644
index 000000000..7f29a8c46
--- /dev/null
+++ b/+ndi/+dataset/+gui/+models/FolderOrganizationModel.m
@@ -0,0 +1,249 @@
+classdef FolderOrganizationModel < ndi.internal.mixin.JsonSerializable & matlab.mixin.SetGet
+
+% Todo: Rename to FolderTreeModel
+
+    properties (Constant) % ndi.internal.mixin.JsonSerializable
+        VERSION = "1.0.0"
+        DESCRIPTION = "NDI Folder Organization Model"
+    end
+
+    properties (Transient)
+        RootDirectory
+    end
+
+    properties (Transient, Dependent) % or setaccess immutable...
+        %PresetFolderModels
+    end
+
+    properties
+        % FolderLevels - A list of FolderLevels objects
+        FolderLevels (1,:) ndi.dataset.gui.models.FolderLevel
+
+        % SubFolders - A list of names (string) for subfolders located
+        % within a session / data folder. Currently no functional role.
+        SubFolders (1,:) string
+    end
+
+    events
+        FolderLevelChanged
+        FolderLevelAdded
+        FolderLevelRemoved
+
+        % OR:
+        FolderModelChanged
+    end
+
+    methods % Constructor
+        function obj = FolderOrganizationModel(propertyValues)
+            arguments
+                propertyValues.?ndi.dataset.gui.models.FolderOrganizationModel
+            end
+            
+            obj.set(propertyValues)
+        end
+    end
+
+    methods % public methods
+        function assertExistSubfolders(obj)
+            numFolderLevels = numel(obj.FolderLevels);
+            subFolderOptions = obj.listFoldersAtDepth(numFolderLevels+1);
+
+            assert( ~isempty(subFolderOptions), 'No subfolders exist at the given folder level' )
+        end
+        
+        function folderRelativePath = getExampleFolder(obj)
+            folderRelativePath = fullfile(obj.FolderLevels.Name);
+        end
+
+        function [folderLevel, folderLevelIdx] = getFolderLevel(obj, folderLevelType)
+            arguments
+                obj
+                folderLevelType (1,1) ndi.dataset.gui.enum.FolderLevelType
+            end
+
+            folderLevelIdx = find( [obj.FolderLevels.Type] == folderLevelType);
+            folderLevel = obj.FolderLevels(folderLevelIdx);
+        end
+
+        function value = getFolderLevelType(obj)
+            value = [obj.FolderLevels.Type];
+        end
+
+        function setFolderLevelType(obj, value)
+            for i = 1:numel(obj.FolderLevels)
+                obj.FolderLevels(i).Type = value(i);
+            end
+        end
+
+        function value = getSubfolders(obj, options)
+            arguments
+                obj
+                options.Type (1,1) ndi.dataset.gui.enum.FolderLevelType
+                options.Id (1,:) string = missing
+            end
+
+            %value = unique(obj.SubFolders);
+        end
+
+        function addSubFolderLevel(obj, propertyValues)
+            arguments
+                obj
+                propertyValues.?ndi.dataset.gui.models.FolderLevel %#ok<INUSA>
+            end
+
+            nvPairs=namedargs2cell(propertyValues);
+            obj.FolderLevels(end+1) = ndi.dataset.gui.models.FolderLevel(nvPairs{:});
+            obj.notify('FolderModelChanged')
+        end
+
+        function removeSubfolderLevel(obj, folderLevelIdx)
+            obj.FolderLevels(folderLevelIdx) = [];
+            obj.notify('FolderModelChanged')
+        end
+        
+        function updateFolderLevel(obj, folderLevelIdx, propertyName, newValue)
+            
+            obj.FolderLevels(folderLevelIdx).(propertyName) = newValue;
+            
+            % Todo: eventdata??
+
+            obj.notify('FolderModelChanged')
+        end
+
+        function addSubfolders(obj, subFolderNames)
+            subFolderNames = reshape(subFolderNames, 1, []);
+            obj.SubFolders = [obj.SubFolders, subFolderNames];
+        end
+    end
+
+    methods
+        function S = getFolderLevelStruct(obj)
+
+            S = struct.empty;
+
+            % Todo: Assign fieldnames and loop...
+            warnState = warning('off', 'MATLAB:structOnObject');
+            for i = 1:numel(obj.FolderLevels)
+                if i == 1
+                    S = struct(obj.FolderLevels(i));
+                else
+                    S(i) = struct(obj.FolderLevels(i));
+                end
+            end
+            warning(warnState)
+            if ~isempty(S)
+                S = rmfield(S, 'FolderNamePrefix');
+            end
+        end
+
+        function updateFolderLevelFromStruct(obj, S)
+            obj.FolderLevels(:) = []; % Delete existing
+
+            for i = 1:numel(S)
+                nvPairs = namedargs2cell(S(i));
+                obj.addSubFolderLevel(nvPairs{:})
+            end
+        end
+    
+        function folderPath = listAllFolders(obj)
+        % listAllFolders - List all folders in a root directory based on model
+            folderPath = string.empty;
+            
+            S = obj.getFolderLevelStruct();
+            if isempty(S); return; end
+            
+            folderPath = cellstr(obj.RootDirectory);
+
+            for i = 1:numel(S)
+
+                % Look for subfolders in the folderpath
+                folderPath = recursiveDir(folderPath, ...
+                    'Expression', S(i).Expression, ...
+                    'Ignore', S(i).IgnoreList, ...
+                    'Type', 'folder', ...
+                    'RecursionDepth', 1, ...
+                    'OutputType', 'FilePath');
+            end
+        end
+    end
+    
+
+    % Methods of folder model
+    methods (Access = private) 
+        function folderPath = getFolderPathAtDepth(obj, subfolderDepth)
+        % getFolderAtDepth - Get path name for the subfolder at given depth
+            
+            rootDirectoryPath = obj.RootDirectory;
+            numFolderLevels = numel(obj.FolderLevels);
+
+            % Todo: Assert subfolderDepth is not deeper than number of subfo
+            assert(subfolderDepth <= numFolderLevels, ...
+                'Subfolder depth must be less than or equal to %d', numFolderLevels)
+
+            if subfolderDepth >= 0 && ~isempty(rootDirectoryPath)
+                folderPath = rootDirectoryPath;
+        
+                for iLevel = 1:subfolderDepth % Get folderpath from data struct...
+                    if isempty( char(obj.FolderLevels(iLevel).Name) )
+                        error('NDI:FolderModel:FolderNameIsEmpty', 'Folder name is not specified for folder level %d', iLevel)
+                    end
+                    folderPath = fullfile(folderPath, obj.FolderLevels(iLevel).Name);
+                end
+            else
+                folderPath = '';
+            end
+        end
+    end
+
+    methods (Access = public)
+        function folderNames = listFoldersAtDepth(obj, subfolderDepth)
+        % listFoldersAtDepth - List all folders at a given depth which pass filters     
+            S = obj.getFolderLevelStruct();
+            
+            rootFolderPath = obj.getFolderPathAtDepth(subfolderDepth-1);
+
+            if subfolderDepth <= numel(obj.FolderLevels)
+                expression = S(subfolderDepth).Expression;
+                ignoreList = S(subfolderDepth).IgnoreList;
+            else
+                expression = "";
+                ignoreList = string.empty;
+            end
+
+            % Look for subfolders in the folderpath
+            L = recursiveDir(rootFolderPath, ...
+                'Expression', expression, ...
+                'Ignore', ignoreList, ...
+                'Type', 'folder', ...
+                'RecursionDepth', 1);
+
+            folderNames = {L.name};
+        end
+    end
+
+    methods (Access = protected)
+        % function fromStruct(obj, S)
+        % 
+        % end
+    end
+
+    methods (Static)
+        function T = getDefaultFolderLevelTable()
+            folderLevel = ndi.dataset.gui.models.FolderLevel();
+            warnState = warning('off', 'MATLAB:structOnObject');
+            S = struct(folderLevel);
+            warning(warnState)
+            S = rmfield(S, 'FolderNamePrefix');
+            T = struct2table(S, "AsArray", true);
+            T = addprop(T, 'VariableTitle', 'variable');
+            T.Properties.CustomProperties.VariableTitle = {'Select subfolder example', 'Set subfolder type', 'Exclusion list', 'Inclusion list'};
+        end
+    end
+
+    methods (Static)
+        function obj = fromJson(jsonStr)
+            className = mfilename('class');
+            obj = fromJson@ndi.internal.mixin.JsonSerializable(jsonStr, className);
+        end
+    end
+end
\ No newline at end of file
diff --git a/+ndi/+dataset/+gui/+pages/+component/DAQSystemEditButtons.mlapp b/+ndi/+dataset/+gui/+pages/+component/DAQSystemEditButtons.mlapp
new file mode 100644
index 000000000..869aadaa9
Binary files /dev/null and b/+ndi/+dataset/+gui/+pages/+component/DAQSystemEditButtons.mlapp differ
diff --git a/+ndi/+dataset/+gui/+pages/+component/DaqSystemsTable.m b/+ndi/+dataset/+gui/+pages/+component/DaqSystemsTable.m
new file mode 100644
index 000000000..ffadcbc55
--- /dev/null
+++ b/+ndi/+dataset/+gui/+pages/+component/DaqSystemsTable.m
@@ -0,0 +1,334 @@
+classdef DaqSystemsTable < applify.apptable
+% Class interface for editing/configuring DAQ System in a uifigure
+
+    % properties / app states depending on outside values:
+    
+    properties (Constant)
+        COLUMN_NAMES = {'', 'Name', 'Select Data Source', 'Select Data Reader', 'File Parameters', '', ''}
+        COLUMN_WIDTHS = [22, 100, 175, 130, 120, 22, 22]
+    end
+
+    properties
+        EditDaqSystemButtonPushedFcn
+    end 
+    
+    properties
+        DaqSystemSpec % stuct/table/object representation of whats in table..
+    end
+
+    properties
+        AppFigure % Todo: make sure this is set...
+    end
+
+    properties
+        IsDirty = false     % Flag to show if data has changed.
+        IsAdvancedView = true
+        IsUpdating = false  % Flag to disable event notification when table is being updated.
+    end
+
+    methods % Structors
+        function obj = DaqSystemsTable(daqSystemConfiguration, varargin)
+        %FolderOrganizationTable Construct a FolderOrganizationTable instance
+            warning('off', 'MATLAB:structOnObject')
+            data = struct( daqSystemConfiguration );
+            warning('on', 'MATLAB:structOnObject')
+            varargin = [{'Data', data}, varargin];
+            obj@applify.apptable(varargin{:})
+            
+            obj.AppFigure = ancestor(obj.Parent, 'figure');
+        end
+        
+        function delete(obj)
+        end
+        
+    end
+    
+    methods (Access = protected) % Implementation of superclass methods
+
+        function assignDefaultTablePropertyValues(obj)
+            obj.ColumnNames = obj.COLUMN_NAMES;
+            obj.ColumnWidths = obj.COLUMN_WIDTHS;
+            obj.ColumnHeaderHelpFcn = @ndi.dataset.gui.getTooltipMessage;
+            obj.RowSpacing = 20;
+        end
+        
+        function hRow = createTableRowComponents(obj, rowData, rowNum)
+        
+            hRow = struct(...
+                          'RemoveImage', obj.createRemoveRowButton(rowNum, 1), ...
+                        'NameEditField', obj.createDaqSystemNameEditfield(rowNum, 2), ...
+                    'DaqSystemDropdown', obj.createDaqSystemSelectionDropdown(rowNum, 3), ...
+                    'DaqReaderDropdown', obj.createDaqReaderSelectionDropdown(rowNum, 4), ...
+              'FileParametersEditfield', obj.createFileParametersEditfield(rowNum, 5), ...
+                           'EditButton', obj.createEditDaqSystemButton(rowNum, 6), ...
+                             'AddImage', obj.createAddRowButton(rowNum, 7) ...
+                             );
+            
+            if obj.NumRows == 0; hRow.RemoveImage.Enable = 'off'; end
+            obj.updateRowComponentValues(hRow, rowData, rowNum)
+        end
+
+        function updateRowComponentValues(obj, rowComponents, rowData, rowNum)
+        % updateRowComponentValues - Update component values from data
+            
+            if isempty(rowData.DaqReaderClass)
+                rowComponents.DaqReaderDropdown.Value = '<Select reader>';
+                obj.Data(rowNum).Type = '';
+            else
+                reader = strsplit(rowData.DaqReaderClass, '.');
+                rowComponents.DaqReaderDropdown.Value = reader{end};
+            end
+
+            if ~isempty(rowData.FileParameters)
+                rowComponents.DynamicRegexp.Value = strjoin( rowData.FileParameters, ',');
+            end
+        end
+            
+    end
+    
+    methods (Access = private)
+        
+        function onRootDirectorySet(obj)
+            obj.onCurrentDataLocationSet()
+        end
+
+        function onCurrentDataLocationSet(obj)
+        %onCurrentDataLocationSet Update controls based on current DataLoc
+        
+            if ~obj.IsConstructed; return; end
+            
+            obj.IsUpdating = true;
+            
+            obj.resetTable()
+            
+            obj.Data = obj.CurrentDataLocation.SubfolderStructure;
+            
+            % Recreate rows.
+            for i = 1:numel(obj.Data)
+                rowData = obj.getRowData(i);
+                obj.createTableRow(rowData, i)
+                
+                obj.updateSubfolderItems(i); % Semicolon, this fcn has output.
+                if ~obj.IsAdvancedView
+                    obj.setRowDisplayMode(i, false)
+                end
+            end
+
+            obj.IsUpdating = false;
+        end
+        
+    end
+    
+    methods % Callbacks for row components
+        
+        function notify(obj, eventName, eventData)
+        %notify Disable event notification when table is being updated
+        %
+        %   Note: Some methods that notify about events are being invoked
+        %   during table update. The method ensures that events are not
+        %   triggered during table update.
+        
+            if obj.IsUpdating 
+                return; 
+            else
+                notify@handle(obj, eventName, eventData)
+            end
+        end
+        
+        function showAdvancedOptions(obj)
+            
+            % Relocate / show header elements
+            obj.setColumnHeaderDisplayMode(true)
+
+            % Relocate / show column elements
+            for i = 1:numel(obj.RowControls)
+                obj.setRowDisplayMode(i, true)
+            end
+            
+            obj.IsAdvancedView = true;
+            drawnow
+        end
+        
+        function hideAdvancedOptions(obj)
+            
+            % Relocate / show header elements
+            obj.setColumnHeaderDisplayMode(false)
+            
+            % Relocate / show column elements
+            for i = 1:numel(obj.RowControls)
+                obj.setRowDisplayMode(i, false)
+            end
+            
+            obj.IsAdvancedView = false;
+            drawnow
+        end
+        
+        function setColumnHeaderDisplayMode(obj, showAdvanced)
+            
+            xOffset = sum(obj.ColumnWidths(4:5)) + obj.ColumnSpacing;
+            visibility = 'off';
+
+            if showAdvanced
+                xOffset = -1 * xOffset;
+                visibility = 'on';
+            end
+            
+            % Relocate / show header elements
+            %obj.ColumnHeaderLabels{2}.Position(3) = obj.ColumnHeaderLabels{2}.Position(3) + xOffset;
+            %obj.ColumnLabelHelpButton{2}.Position(1) = obj.ColumnLabelHelpButton{2}.Position(1) + xOffset;
+            
+            obj.ColumnHeaderLabels{3}.Position(1) = obj.ColumnHeaderLabels{3}.Position(1) + xOffset;
+            obj.ColumnLabelHelpButton{3}.Position(1) = obj.ColumnLabelHelpButton{3}.Position(1) + xOffset;
+            
+            obj.ColumnHeaderLabels{4}.Visible = visibility;
+            obj.ColumnLabelHelpButton{4}.Visible = visibility;
+            
+            obj.ColumnHeaderLabels{5}.Visible = visibility;
+            obj.ColumnLabelHelpButton{5}.Visible = visibility;
+        end
+        
+        function setRowDisplayMode(obj, rowNum, showAdvanced)
+            
+            xOffset = sum(obj.ColumnWidths(4:5)) + obj.ColumnSpacing;
+            visibility = 'off';
+
+            if showAdvanced
+                xOffset = -1 * xOffset;
+                visibility = 'on';
+            end
+            
+            hRow = obj.RowControls(rowNum);
+            hRow.SubfolderDropdown.Position(3) = hRow.SubfolderDropdown.Position(3) + xOffset;
+            hRow.SubfolderTypeDropdown.Position(1) = hRow.SubfolderTypeDropdown.Position(1) + xOffset;
+            hRow.DynamicRegexp.Visible = visibility;
+            hRow.IgnoreList.Visible = visibility;
+        end
+        
+        function markClean(obj)
+            obj.IsDirty = false;
+        end
+        
+        function markDirty(obj)
+            obj.IsDirty = true;
+        end
+
+        function onRemoveRowButtonPushed(obj, src, ~)
+            if nargin < 2 % Remove last row if no input is given.
+                i = obj.NumRows;
+            elseif isnumeric(src)
+                i = src;
+            else
+                i = obj.getComponentRowNumber(src);
+            end
+            
+            obj.removeRow(i)
+        end
+
+        function onDAQSystemNameChanged(obj, src, evt)
+        end
+
+        function onDaqSystemSelectionChanged(obj, src, evt)
+        end
+
+        function onDaqReaderSelectionChanged(obj, src, evt)
+            % Todo: Need to expand full classname...
+        end
+
+        function onFileParametersValueChanged(obj, src, evt)
+
+        end
+
+        function onEditDaqSystemButtonPushed(obj, src, ~)
+            if ~isempty(obj.EditDaqSystemButtonPushedFcn)
+                hProgress = uiprogressdlg(obj.AppFigure, "Indeterminate", "on", "Message", "Opening DAQ System Editor");
+                
+                % Todo: Get DAQ System
+                daqSystem = [];
+                obj.EditDaqSystemButtonPushedFcn(daqSystem)
+
+                delete(hProgress)
+            end
+        end
+
+        function onAddDaqSystemButtonPushed(obj, src, evt)
+        end
+    end
+
+    methods (Access = private) % Create individual components
+        function hButton = createRemoveRowButton(obj, rowIdx, columnIdx)
+        % createRemoveRowButton - Button with minus icon for removing row
+            [xi, y, wi, h] = obj.getCellPosition(rowIdx, columnIdx);
+            hButton = uibutton(obj.TablePanel);
+            hButton.Position = [xi y wi h];
+            hButton.Text = '';
+            hButton.Icon = nansen.internal.getIconPathName('minus.png');
+            hButton.ButtonPushedFcn = @obj.onRemoveRowButtonPushed;
+        end
+
+        function hEditfield = createDaqSystemNameEditfield(obj, rowIdx, columnIdx)
+        % createDaqSystemNameEditfield - Create editfield for entering a name
+
+            [xi, y, wi, h] = obj.getCellPosition(rowIdx, columnIdx);
+            hEditfield = uieditfield(obj.TablePanel, 'text');
+            hEditfield.Position = [xi y wi h];
+            hEditfield.FontName = 'Segoe UI';
+            hEditfield.BackgroundColor = [1 1 1];
+            hEditfield.ValueChangedFcn = @obj.onDAQSystemNameChanged;
+        end
+
+        function hDropdown = createDaqSystemSelectionDropdown(obj, rowIdx, columnIdx)
+        % createSubfolderSelectionDropdown - Create dropdown for selecting subfolder name
+            [xi, y, wi, h] = obj.getCellPosition(rowIdx, columnIdx);
+            hDropdown = uidropdown(obj.TablePanel);
+            hDropdown.Position = [xi y wi h];
+            hDropdown.FontName = 'Segoe UI';
+            hDropdown.BackgroundColor = [1 1 1];
+            hDropdown.ValueChangedFcn = @obj.onDaqSystemSelectionChanged;
+            hDropdown.Items = {'Multi-function DAQ'};
+            hDropdown.Value = 'Multi-function DAQ';
+        end
+
+        function hDropdown = createDaqReaderSelectionDropdown(obj, rowIdx, columnIdx)
+        % createSubfolderTypeSelectionDropdown - Create dropdown for selecting subfolder type
+            [xi, y, wi, h] = obj.getCellPosition(rowIdx, columnIdx);
+            hDropdown = uidropdown(obj.TablePanel);
+            hDropdown.Position = [xi y wi h];
+            hDropdown.ValueChangedFcn = @obj.onDaqReaderSelectionChanged;
+            %hDropdown.Items = [{'<Select reader>'}, ndi.setup.daq.listDaqReaders()];
+            hDropdown.Items = [{'<Select reader>'}, ndi.setup.daq.listDaqReaders()];
+        end
+
+        function hEditfield = createFileParametersEditfield(obj, rowIdx, columnIdx)
+        % createFileParametersEditfield - Create editfield for entering a
+        % file name expressinons
+
+            [xi, y, wi, h] = obj.getCellPosition(rowIdx, columnIdx);
+            hEditfield = uieditfield(obj.TablePanel, 'text');
+            hEditfield.Position = [xi y wi h];
+            hEditfield.FontName = 'Segoe UI';
+            hEditfield.BackgroundColor = [1 1 1];
+            hEditfield.ValueChangedFcn = @obj.onFileParametersValueChanged;
+        end
+
+        function hButton = createEditDaqSystemButton(obj, rowIdx, columnIdx)
+        % createEditDaqSystemButton - Create button for editing DAQ system
+            [xi, y, wi, h] = obj.getCellPosition(rowIdx, columnIdx);
+            hButton = uibutton(obj.TablePanel);
+            hButton.Position = [xi y wi h];
+            hButton.Text = '';
+            hButton.Icon = nansen.internal.getIconPathName('ellipsis.png');
+            hButton.ButtonPushedFcn = @obj.onEditDaqSystemButtonPushed;
+        end
+
+        function bButton = createAddRowButton(obj, rowIdx, columnIdx)
+        % createSubfolderTypeSelectionDropdown - Create dropdown for selecting subfolder type
+            [xi, y, wi, h] = obj.getCellPosition(rowIdx, columnIdx);
+            bButton = uibutton(obj.TablePanel);
+            bButton.Position = [xi y wi h];
+            bButton.Text = '';
+            bButton.Icon = nansen.internal.getIconPathName('plus.png');
+            bButton.ButtonPushedFcn = @obj.onAddDaqSystemButtonPushed;
+            bButton.Enable = 'off';
+        end
+    end
+end
\ No newline at end of file
diff --git a/+ndi/+dataset/+gui/+pages/+component/DatasetComponent.mlapp b/+ndi/+dataset/+gui/+pages/+component/DatasetComponent.mlapp
new file mode 100644
index 000000000..806450bad
Binary files /dev/null and b/+ndi/+dataset/+gui/+pages/+component/DatasetComponent.mlapp differ
diff --git a/+ndi/+dataset/+gui/+pages/+component/FolderOrganizationTable.m b/+ndi/+dataset/+gui/+pages/+component/FolderOrganizationTable.m
new file mode 100644
index 000000000..93d06914c
--- /dev/null
+++ b/+ndi/+dataset/+gui/+pages/+component/FolderOrganizationTable.m
@@ -0,0 +1,651 @@
+classdef FolderOrganizationTable < applify.apptable
+% FolderOrganizationTable - A table for uifigures to specify folder organization
+
+% Note: this class is a mess when it comes to updating the data and values.
+% Needs work in order to instantly update the datalocation model on
+% changes. The methods for updating are misused, so that whenever the
+% subfolder example selection is changed, add row and remove row is called,
+% although this does not mean the model is changed. Need to separate
+% methods better...
+
+%   Methods that use updateSubfolderItems
+%       - addrow
+%       - subfolderChanged
+%       - onIgnoreExpressionValueChanged
+%       - onFilterExpressionValueChanged
+%       - onRootDirectorySet
+%
+%   should separate beteen whether 1) names of existing subfolder levels are
+%   changed, 2) subfolders levels are added or removed and 3) datalocation
+%   is set/changed.
+
+    % updateRowData
+    % updateDirectoryTree
+
+    properties (Constant)
+        COLUMN_NAMES = {'', 'Select subfolder example', 'Set subfolder type', 'Exclusion list', 'Inclusion list', ''}
+        COLUMN_WIDTHS = [22, 175, 130, 90, 125, 22]
+    end
+
+    % properties / app states depending on outside values:
+    properties
+        RootDirectory
+
+        % Data... Should be an object with callbacks and events?
+        
+        % stuct/table/object representation of whats in table..
+        SubfolderStructure
+        CurrentDataLocation
+    end
+
+    properties
+        AppFigure % Todo: make sure this is set... Needed???
+    end
+
+    properties
+        IsDirty = false     % Flag to show if data has changed.
+        IsAdvancedView = true
+        IsUpdating = false  % Flag to disable event notification when table is being updated.
+    end
+
+    properties (Access = private)
+        FolderOrganizationFilterListener
+    end
+    
+    events
+        FilterChanged
+        ModelChanged
+    end
+    
+    methods % Structors
+        function obj = FolderOrganizationTable(folderOrganizationModel, varargin)
+        %FolderOrganizationTable - Construct a FolderOrganizationTable instance
+            
+            % Todo:
+            % 2 inputs: 
+            %   1) Root directory
+            %   2) Folder organization model...
+            
+            if ~isempty(folderOrganizationModel)
+                varargin = [varargin, {'Data', folderOrganizationModel.FolderLevels}];
+            end
+
+            obj@applify.apptable(varargin{:})
+            
+            if ~isempty(folderOrganizationModel)
+                obj.SubfolderStructure = folderOrganizationModel.FolderLevels;   
+            end
+
+            obj.IsUpdating = true;
+            for i = 1:obj.NumRows
+                obj.updateSubfolderItems(i);
+            end
+            obj.IsDirty = false;
+            obj.IsUpdating = false;
+            obj.AppFigure = ancestor(obj.Parent, 'figure');
+        end
+        
+        function delete(obj)
+            isDeletable = @(h) ~isempty(h) && isvalid(h);
+            
+            if isDeletable(obj.FolderOrganizationFilterListener)
+                delete(obj.FolderOrganizationFilterListener)
+            end
+        end
+    end
+
+    methods % Set/get
+        function set.RootDirectory(obj, newValue)
+            obj.RootDirectory = newValue;
+            obj.onRootDirectorySet()
+        end
+
+        function set.SubfolderStructure(obj, newValue)
+            obj.SubfolderStructure = newValue;
+            obj.onSubfolderStructureSet()
+        end
+    end 
+    
+    methods (Access = protected) % Implementation of superclass (UIControlTable) methods
+
+        function assignDefaultTablePropertyValues(obj)
+            obj.ColumnNames = obj.COLUMN_NAMES;
+            obj.ColumnWidths = obj.COLUMN_WIDTHS;
+            obj.ColumnHeaderHelpFcn = @ndi.dataset.gui.getTooltipMessage;
+            obj.RowSpacing = 20;
+        end
+        
+        function hRow = createTableRowComponents(obj, rowData, rowNum)
+        
+            hRow = struct(...
+                      'RemoveImage', obj.createRemoveRowButton(rowNum, 1), ...
+                'SubfolderDropdown', obj.createSubfolderSelectionDropdown(rowNum, 2), ...
+            'SubfolderTypeDropdown', obj.createSubfolderTypeSelectionDropdown(rowNum, 3), ...
+                    'DynamicRegexp', obj.createFilterExpressionEditfield(rowNum, 5), ...
+                       'IgnoreList', obj.createIgnoreExpressionEditfield(rowNum, 4), ...
+                         'AddImage', obj.createAddRowButton(rowNum, 6) ...
+                         );
+            
+            % Customize components...
+            if obj.NumRows == 0; hRow.RemoveImage.Enable = 'off'; end
+            if rowNum == 1; hRow.RemoveImage.Enable = 'off'; end
+           
+            if rowNum > 1
+                % Disable the button for add new row on the previous row.
+                obj.RowControls(rowNum-1).AddImage.Enable = 'off';
+            end
+
+            obj.updateRowComponentValues(hRow, rowData, rowNum)
+        end
+
+        function updateRowComponentValues(obj, rowComponents, rowData, rowNum)
+        % updateRowComponentValues - Update component values from data
+            
+            if isempty(rowData.Type) || strcmp(rowData.Type, 'Undefined')
+                rowComponents.SubfolderTypeDropdown.Value = 'Select type';
+                obj.Data(rowNum).Type = 'Undefined';
+            else
+                rowComponents.SubfolderTypeDropdown.Value = rowData.Type;
+            end
+
+            if ~isempty(rowData.Expression)
+                rowComponents.DynamicRegexp.Value = rowData.Expression;
+            end
+
+            if ~isempty(rowData.IgnoreList)
+                rowComponents.IgnoreList.Value = strjoin(rowData.IgnoreList, ', ');
+            end
+        end
+    end
+    
+    methods (Access = private) % Callbacks for table / component
+        
+        function onRootDirectorySet(obj)
+        %onRootDirectorySet - Update table when root directory is set
+            if ~obj.IsConstructed; return; end
+            
+            obj.IsUpdating = true;
+            obj.resetTable()
+            obj.Data = obj.SubfolderStructure;
+            obj.updateTable()
+            obj.IsUpdating = false;
+        end
+
+        function onSubfolderStructureSet(obj)
+        %onSubfolderStructureSet - Update table when subfolder structure is set
+
+            if ~obj.IsConstructed; return; end
+
+            obj.IsUpdating = true;
+            obj.resetTable()
+            obj.Data = obj.SubfolderStructure;
+            obj.updateTable()
+            obj.IsUpdating = false;
+        end
+    end
+
+    methods % Todo: (Access = protected) % Override superclass (UIControlTable) methods
+        function wasSuccess = addRow(obj, src, ~)
+            
+            src.Enable = 'off';
+            addRow@applify.apptable(obj)
+            
+            % Get row number of new row.
+            rowNum = obj.getComponentRowNumber(src) + 1;
+
+            if ~obj.IsAdvancedView
+                obj.setRowDisplayMode(rowNum, false)
+            end
+            
+            % Todo: should refactor this so that first, we check if folders
+            % are available, then add row if confirmed...
+            wasSuccess = obj.updateSubfolderItems(rowNum);
+            if ~wasSuccess
+                obj.removeRow()
+                return
+            end
+            
+            evtData = event.EventData();
+            obj.notify('FilterChanged', evtData)
+        end
+        
+        function removeRow(obj, src, ~)
+            
+            if nargin < 2 % Remove last row if no input is given.
+                i = obj.NumRows;
+            elseif isnumeric(src)
+                i = src;
+            else
+                i = obj.getComponentRowNumber(src);
+            end
+            
+            removeRow@applify.apptable(obj, i)
+            
+            % Enable button for adding new row on the row above the one 
+            % that was just removed.
+            if i > 1
+                obj.RowControls(i-1).AddImage.Enable = 'on';
+            end
+            
+            evtData = event.EventData();
+            obj.notify('FilterChanged', evtData)
+        end
+    
+        % Todo: Generalize. Should be method of UIControlTable to get
+        % current data as a table
+        function S = getSubfolderStructure(obj)
+
+            % This method retrieves data from components and places it in a
+            % struct.
+            
+            S = struct('Name', {}, 'Type', {}, 'Expression', {}, 'IgnoreList', {{}});
+            
+            for j = 1:numel(obj.RowControls)
+                
+                S(j).Name = obj.RowControls(j).SubfolderDropdown.Value;
+                S(j).Type = obj.RowControls(j).SubfolderTypeDropdown.Value;
+                
+                if strcmp(S(j).Type, 'Select type')
+                    S(j).Type = 'Undefined';
+                end
+                
+                inputExpr = obj.RowControls(j).DynamicRegexp.Value;
+
+                % Convert input expressions to expression that can be
+                % used with the regexp function
+                if strcmp(S(j).Type, 'Date')
+                    S(j).Expression = utility.string.dateformat2expression(inputExpr);
+                    S(j).Expression = utility.string.numbersymbol2expression(S(j).Expression);
+                else
+                    S(j).Expression = utility.string.numbersymbol2expression(inputExpr);
+                end
+                
+                ignoreList = obj.RowControls(j).IgnoreList.Value;
+                if isempty(ignoreList)
+                    S(j).IgnoreList = {};
+                else
+                    S(j).IgnoreList = strsplit(obj.RowControls(j).IgnoreList.Value, ',');
+                    S(j).IgnoreList = strtrim(S(j).IgnoreList);
+                    % If someone accidentally entered a comma at the end of
+                    % the list.
+                    if isempty(S(j).IgnoreList{end})
+                        S(j).IgnoreList(end) = [];
+                    end
+                end
+            end
+        end
+    end
+
+    methods % (Access = protected) % Internal methods
+        
+        function notify(obj, eventName, eventData)
+        %notify Disable event notification when table is being updated
+        %
+        %   Note: Some methods that notify about events are being invoked
+        %   during table update. The method ensures that events are not
+        %   triggered during table update.
+        
+            if obj.IsUpdating 
+                return; 
+            else
+                notify@handle(obj, eventName, eventData)
+            end
+        end
+        
+        function showAdvancedOptions(obj)
+            
+            % Relocate / show header elements
+            obj.setColumnHeaderDisplayMode(true)
+
+            % Relocate / show column elements
+            for i = 1:numel(obj.RowControls)
+                obj.setRowDisplayMode(i, true)
+            end
+            
+            obj.IsAdvancedView = true;
+            drawnow
+        end
+        
+        function hideAdvancedOptions(obj)
+            
+            % Relocate / show header elements
+            obj.setColumnHeaderDisplayMode(false)
+            
+            % Relocate / show column elements
+            for i = 1:numel(obj.RowControls)
+                obj.setRowDisplayMode(i, false)
+            end
+            
+            obj.IsAdvancedView = false;
+            drawnow
+        end
+                
+        function setColumnHeaderDisplayMode(obj, showAdvanced)
+            
+            xOffset = sum(obj.ColumnWidths(4:5)) + obj.ColumnSpacing;
+            visibility = 'off';
+
+            if showAdvanced
+                xOffset = -1 * xOffset;
+                visibility = 'on';
+            end
+            
+            % Relocate / show header elements
+            %obj.ColumnHeaderLabels{2}.Position(3) = obj.ColumnHeaderLabels{2}.Position(3) + xOffset;
+            %obj.ColumnLabelHelpButton{2}.Position(1) = obj.ColumnLabelHelpButton{2}.Position(1) + xOffset;
+            
+            obj.ColumnHeaderLabels{3}.Position(1) = obj.ColumnHeaderLabels{3}.Position(1) + xOffset;
+            obj.ColumnLabelHelpButton{3}.Position(1) = obj.ColumnLabelHelpButton{3}.Position(1) + xOffset;
+            
+            obj.ColumnHeaderLabels{4}.Visible = visibility;
+            obj.ColumnLabelHelpButton{4}.Visible = visibility;
+            
+            obj.ColumnHeaderLabels{5}.Visible = visibility;
+            obj.ColumnLabelHelpButton{5}.Visible = visibility;
+        end
+        
+        function setRowDisplayMode(obj, rowNum, showAdvanced)
+            
+            xOffset = sum(obj.ColumnWidths(4:5)) + obj.ColumnSpacing;
+            visibility = 'off';
+
+            if showAdvanced
+                xOffset = -1 * xOffset;
+                visibility = 'on';
+            end
+            
+            hRow = obj.RowControls(rowNum);
+            hRow.SubfolderDropdown.Position(3) = hRow.SubfolderDropdown.Position(3) + xOffset;
+            hRow.SubfolderTypeDropdown.Position(1) = hRow.SubfolderTypeDropdown.Position(1) + xOffset;
+            hRow.DynamicRegexp.Visible = visibility;
+            hRow.IgnoreList.Visible = visibility;
+        end
+        
+        function markClean(obj)
+            obj.IsDirty = false;
+        end
+        
+        function markDirty(obj)
+            obj.IsDirty = true;
+        end
+    end
+
+    methods % Updating subfolders...
+        function updateTable(obj)
+            
+            % Recreate rows.
+            for i = 1:numel(obj.Data)
+                rowData = obj.getRowData(i);
+                obj.createTableRow(rowData, i)
+                
+                obj.updateSubfolderItems(i); % Semicolon, this fcn has output.
+                if ~obj.IsAdvancedView
+                    obj.setRowDisplayMode(i, false)
+                end
+            end
+        end
+        
+        function subfolderChanged(obj, src, ~)
+            
+            obj.IsDirty = true;
+            iRow = obj.getComponentRowNumber(src);
+            
+            %Update data property obj.Data(iRow).Name
+            obj.Data(iRow).Name = obj.RowControls(iRow).SubfolderDropdown.Value;
+
+            if iRow == obj.NumRows
+                return
+            end
+            
+            % Update list of subfolder items on the next row
+            obj.updateSubfolderItems( iRow+1 )
+            
+            % Remove subfolders on successive rows if present
+            for i = iRow+2:numel(obj.NumRows)
+                obj.removeRow()
+            end
+        end
+
+        function success = updateSubfolderItems(obj, iRow)
+        %updateSubfolderItems Update values in controls...
+            
+            success = true;
+
+            % if isempty(obj.CurrentDataLocation.RootPath)
+            %     rootDirectoryPath = '';
+            % else
+            %     rootDirectoryPath = obj.CurrentDataLocation.RootPath(1).Value;
+            % end
+
+            rootDirectoryPath = obj.RootDirectory;
+            
+            % Get path for parent folder of current row (subfolder depth)
+            parentFolderPath = obj.getFolderPathAtDepth(iRow-1);
+            
+            % List subfolders at current level:
+            subfolderNames = obj.listFoldersAtDepth(parentFolderPath, iRow);
+
+            % Todo: Add something like this if implementing virtual folders
+            % in a datalocation
+% % %             if isempty(dirName)
+% % %                 % show message...
+% % %                 [~, dirName] = utility.path.listFiles(folderPath);
+% % %             end
+            
+            % Get handle to dropdown control
+            hSubfolderDropdown = obj.RowControls(iRow).SubfolderDropdown;
+            
+            % Show message dialog and return if no subfolders are found.
+            if isempty(rootDirectoryPath)
+                hSubfolderDropdown.Items = {'Root folder is not specified'};
+                if ~nargout; clear success; end
+                return
+            elseif ~isfolder( rootDirectoryPath )
+                hSubfolderDropdown.Items = {'Root folder does not exist'};
+                if ~nargout; clear success; end
+                return
+            elseif isempty(subfolderNames) % && iRow > 1
+% %                 message = 'No subfolders were found within the selected folder';
+% %                 hFigure = ancestor(obj.Parent, 'figure');
+% %                 uialert(hFigure, message, 'Aborting')
+                success = false;
+                hSubfolderDropdown.Items = {'No subfolders were found'};            
+                if ~nargout; clear success; end
+                return
+            end
+            
+            % Need to update field based on current data.
+            hSubfolderDropdown.Items = subfolderNames;
+            
+            if isempty( char( obj.Data(iRow).Name ) ) 
+                % Select the first subfolder:
+                newValue = subfolderNames{1};
+            else
+                if ~contains(hSubfolderDropdown.Items, obj.Data(iRow).Name)
+                    % Todo: Add message saying that folder was not
+                    % available in detected items.
+                    newValue = subfolderNames{1};
+                else
+                    newValue = obj.Data(iRow).Name;
+                end
+            end
+            
+            if ~isequal(hSubfolderDropdown.Value, newValue)
+                hSubfolderDropdown.Value = newValue;
+                if ~obj.IsUpdating
+                    obj.subfolderChanged(hSubfolderDropdown)
+                end
+            end
+            
+            obj.Data(iRow).Name = hSubfolderDropdown.Value;
+            
+            % Switch button for adding new row.
+            if iRow == obj.NumRows
+                obj.RowControls(iRow).AddImage.Enable = 'on';
+            end
+            
+            obj.IsDirty = true;
+            
+            if ~nargout; clear success; end
+        end
+    end
+
+    methods (Access = private) % Todo: methods of folder model
+        function folderPath = getFolderPathAtDepth(obj, subfolderDepth)
+        % getFolderAtDepth - Get path name for the subfolder at given depth
+                    
+            rootDirectoryPath = obj.RootDirectory;
+
+            if subfolderDepth >= 0 && ~isempty(rootDirectoryPath)
+                folderPath = rootDirectoryPath;
+        
+                for iLevel = 1:subfolderDepth % Get folderpath from data struct...
+                    folderPath = fullfile(folderPath, obj.Data(iLevel).Name);
+                end
+            else
+                folderPath = '';
+            end
+        end
+
+        function folderNames = listFoldersAtDepth(obj, parentFolderPath, subfolderDepth)
+        % listFoldersAtDepth - List all folders at a given depth which pass filters     
+            S = obj.getSubfolderStructure();
+            
+            % Look for subfolders in the folderpath
+            [~, folderNames] = utility.path.listSubDir(parentFolderPath, ...
+                S(subfolderDepth).Expression, S(subfolderDepth).IgnoreList);
+        end
+    end
+
+    methods (Access = private) % Callbacks for row components
+        % Callback for SubfolderSelectionDropdown
+        function onSubfolderSelectionChanged(obj, src, ~)
+            obj.subfolderChanged(src)
+        end
+        
+        % Callback for SubfolderSelectionTypeDropdown
+        function onSubFolderTypeSelectionChanged(obj, src, evt)
+            iRow = obj.getComponentRowNumber(src);
+            obj.SubfolderStructure(iRow).Type = src.Value;
+            obj.Data(iRow).Type = src.Value;
+            obj.markDirty()
+        end
+        
+        % Callback for IgnoreExpressionEditfield
+        function onIgnoreExpressionValueChanged(obj, src, evt)
+            iRow = obj.getComponentRowNumber(src);
+            if isempty(src.Value)
+                obj.Data(iRow).IgnoreList = {};
+            else
+                obj.Data(iRow).IgnoreList = strtrim( strsplit(src.Value, ',') );
+            end
+            obj.SubfolderStructure(iRow).IgnoreList = obj.Data(iRow).IgnoreList;
+            obj.markDirty()
+            
+            evtData = event.EventData();
+            obj.notify('FilterChanged', evtData)
+            
+            obj.updateSubfolderItems(iRow)
+        end
+        
+        % Callback for FilterExpressionEditfield
+        function onFilterExpressionValueChanged(obj, src, evt)
+            iRow = obj.getComponentRowNumber(src);
+            obj.Data(iRow).Expression = src.Value;
+            obj.markDirty()
+            
+            evtData = event.EventData();
+            obj.notify('FilterChanged', evtData)
+            
+            obj.updateSubfolderItems(iRow); % supress output
+        end
+        
+        % Callback for AddRowButton
+        function onAddSubfolderButtonPushed(obj, src, ~)
+            
+            wasSuccess = obj.addRow(src);
+            
+            % Show message to user if this failed.
+            if ~wasSuccess
+                hFigure = ancestor(obj.Parent, 'figure');
+                message = 'No subfolders were found within the selected folder';
+                uialert(hFigure, message, 'Aborting')
+            else
+                obj.SubfolderStructure(end+1) = feval( class(obj.SubfolderStructure) );
+            end
+        end
+
+        function onRemoveSubfolderLevelButtonPushed(obj, ~, ~)
+            obj.removeRow()
+            obj.SubfolderStructure(end) = [];
+        end
+    end
+
+    methods (Access = private) % Create individual components
+        function hButton = createRemoveRowButton(obj, rowIdx, columnIdx)
+        % createRemoveRowButton - Button with minus icon for removing row
+            [xi, y, wi, h] = obj.getCellPosition(rowIdx, columnIdx);
+            hButton = uibutton(obj.TablePanel);
+            hButton.Position = [xi y wi h];
+            hButton.Text = '';
+            hButton.Icon = nansen.internal.getIconPathName('minus.png');
+            hButton.ButtonPushedFcn = @obj.onRemoveSubfolderLevelButtonPushed;
+        end
+
+        function hDropdown = createSubfolderSelectionDropdown(obj, rowIdx, columnIdx)
+        % createSubfolderSelectionDropdown - Create dropdown for selecting subfolder name
+            [xi, y, wi, h] = obj.getCellPosition(rowIdx, columnIdx);
+            hDropdown = uidropdown(obj.TablePanel);
+            hDropdown.Position = [xi y wi h];
+            hDropdown.FontName = 'Segoe UI';
+            hDropdown.BackgroundColor = [1 1 1];
+            hDropdown.ValueChangedFcn = @obj.onSubfolderSelectionChanged;
+            hDropdown.Items = {'Select subfolder'};
+            hDropdown.Value = 'Select subfolder';
+        end
+
+        function hDropdown = createSubfolderTypeSelectionDropdown(obj, rowIdx, columnIdx)
+        % createSubfolderTypeSelectionDropdown - Create dropdown for selecting subfolder type
+            [xi, y, wi, h] = obj.getCellPosition(rowIdx, columnIdx);
+            hDropdown = uidropdown(obj.TablePanel);
+            hDropdown.Position = [xi y wi h];
+            hDropdown.ValueChangedFcn = @obj.onSubFolderTypeSelectionChanged;
+            % Todo: Get from enum?
+            hDropdown.Items = {'Select type', 'Date', 'Subject', 'Session', 'Epoch', 'Other'};
+        end
+
+        function hEditfield = createFilterExpressionEditfield(obj, rowIdx, columnIdx)
+        % createFilterExpressionEditfield - Create editfield for entering a filter expression
+        %
+        %   This field will be used to filter the folders on the
+        %   corresponding subfolder level.
+            [xi, y, wi, h] = obj.getCellPosition(rowIdx, columnIdx);
+            hEditfield = uieditfield(obj.TablePanel, 'text');
+            hEditfield.Position = [xi y wi h];
+            hEditfield.FontName = 'Segoe UI';
+            hEditfield.BackgroundColor = [1 1 1];
+            hEditfield.ValueChangedFcn = @obj.onFilterExpressionValueChanged;
+        end
+
+        function hEditfield = createIgnoreExpressionEditfield(obj, rowIdx, columnIdx)
+        % createSubfolderTypeSelectionDropdown - Create dropdown for selecting subfolder type
+            [xi, y, wi, h] = obj.getCellPosition(rowIdx, columnIdx);
+            hEditfield = uieditfield(obj.TablePanel, 'text');
+            hEditfield.Position = [xi y wi h];
+            hEditfield.FontName = 'Segoe UI';
+            hEditfield.BackgroundColor = [1 1 1];
+            hEditfield.ValueChangedFcn = @obj.onIgnoreExpressionValueChanged;
+        end
+
+        function bButton = createAddRowButton(obj, rowIdx, columnIdx)
+        % createSubfolderTypeSelectionDropdown - Create dropdown for selecting subfolder type
+            [xi, y, wi, h] = obj.getCellPosition(rowIdx, columnIdx);
+            bButton = uibutton(obj.TablePanel);
+            bButton.Position = [xi y wi h];
+            bButton.Text = '';
+            bButton.Icon = nansen.internal.getIconPathName('plus.png');
+            bButton.ButtonPushedFcn = @obj.onAddSubfolderButtonPushed;
+            bButton.Enable = 'off';
+        end
+    end
+end
\ No newline at end of file
diff --git a/+ndi/+dataset/+gui/+pages/+component/FolderOrganizationToolbar.mlapp b/+ndi/+dataset/+gui/+pages/+component/FolderOrganizationToolbar.mlapp
new file mode 100644
index 000000000..d16e27ba2
Binary files /dev/null and b/+ndi/+dataset/+gui/+pages/+component/FolderOrganizationToolbar.mlapp differ
diff --git a/+ndi/+dataset/+gui/+pages/DaqSystemsPage.m b/+ndi/+dataset/+gui/+pages/DaqSystemsPage.m
new file mode 100644
index 000000000..ac825290f
--- /dev/null
+++ b/+ndi/+dataset/+gui/+pages/DaqSystemsPage.m
@@ -0,0 +1,262 @@
+classdef DaqSystemsPage < ndi.gui.window.wizard.abstract.Page
+
+    % Setting pagedata shouls update the widgets table..
+    
+    % Todo: Create the uiwidget table...
+    % Add listeners for cell edited, row added and row removed.
+
+    % Responsibility:
+    %   Update widget from data
+    %   Update data from widget
+
+    properties (Constant)
+        Name = "DAQ Systems"
+        Title = "DAQ Systems"
+        Description = "Select DAQ Systems for your dataset"
+    end
+    
+    properties (Access = private)
+        Widget % Todo: UITable?
+        TableGridLayout
+    end
+    
+    properties (SetAccess = ?ndi.gui.window.wizard.WizardApp)
+        PageData ndi.dataset.gui.models.DaqSystemCollection
+    end
+
+    properties %(Dependent)
+        EditDaqSystemFcn
+    end
+
+    events
+        %UserAction
+    end
+
+    methods
+        function obj = DaqSystemsPage()
+
+        end
+    end
+
+    methods
+        function set.PageData(obj, value)
+            obj.PageData = value;
+            obj.postSetPageData()
+        end
+
+        function set.EditDaqSystemFcn(obj, value)
+            obj.EditDaqSystemFcn = value;
+        end
+
+        function value = get.EditDaqSystemFcn(obj)
+            value = obj.EditDaqSystemFcn;
+        end
+    end
+
+    methods (Access = protected)
+        function onPageEntered(obj)
+            % Subclasses may override
+        end
+
+        function onPageExited(obj)
+            % Subclasses may override
+        end
+
+        function createComponents(obj)            
+            obj.TableGridLayout = uigridlayout(obj.UIPanel);
+            obj.TableGridLayout.ColumnWidth={'1x'};
+            obj.TableGridLayout.RowHeight={'1x'};
+            obj.TableGridLayout.Padding = [20,0,20,0];
+            obj.TableGridLayout.BackgroundColor = 'w';
+
+            customColumnFcn = @(h, varargin) ...
+                ndi.dataset.gui.pages.component.DAQSystemEditButtons(h, ...
+                    'ButtonPushedFcn', @obj.onDaqSystemActionButtonPushed);
+
+            obj.Widget = WidgetTable(obj.TableGridLayout, 'ItemName', 'DAQ System Configuration');
+            obj.Widget.HeaderBackgroundColor = "#FFFFFF";
+            obj.Widget.HeaderForegroundColor = "#002054";
+            obj.Widget.BackgroundColor = 'w';
+            obj.Widget.ColumnNames = {'DAQ system type', 'DAQ System Name', 'DAQ reader', ''};
+            obj.Widget.ColumnWidth = {185, 175, 150, 100};
+            obj.Widget.ColumnWidget = {'', '', '', customColumnFcn};
+            obj.Widget.TableBorderType = 'none';
+            obj.Widget.MinimumColumnWidth = 120;            
+            
+            if isempty(obj.PageData) || isempty(obj.PageData.DaqSystems)
+                % Set DefaultRowData if PageData is empty..
+                tbl = obj.getDefaultDAQConfigTable();
+                obj.Widget.setDefaultRowData(tbl);
+            else
+                tbl = obj.convertDaqSystemObjectToTable(obj.PageData.DaqSystems);
+                obj.Widget.Data = tbl;
+            end
+
+            % Set callbacks...
+            obj.Widget.RowAddedFcn = @obj.onDAQSystemAdded;
+            obj.Widget.RowRemovedFcn = @obj.onDAQSystemRemoved;
+            obj.Widget.CellEditedFcn = @obj.onTableCellValueChanged;
+
+            %obj.Widget.EditDaqSystemButtonPushedFcn = @obj.onEditDaqSystemButtonPushed;
+        end
+    end
+
+    methods (Access = private)
+        function onDaqSystemActionButtonPushed(obj, src, evt)
+            rowIndex = src.Parent.Layout.Row;
+            
+            switch evt.UserAction
+                case 'Load'
+                    [fileName, folder] = uigetfile('*.json');
+                    if fileName==0
+                        return
+                    end
+
+                    obj.PageData.DaqSystems(rowIndex) = ...
+                        ndi.setup.DaqSystemConfiguration.fromConfigFile(fullfile(folder, fileName));
+                    newValue = obj.PageData.DaqSystems(rowIndex).Name;
+                    obj.Widget.updateCellValue(rowIndex, 2, char(newValue))
+                    
+                case 'Edit'
+                    if ~isempty(obj.EditDaqSystemFcn)
+                        daqSystem = obj.PageData.DaqSystems(rowIndex);
+                        updateDaqSystem = obj.EditDaqSystemFcn(daqSystem);
+
+                        obj.PageData.DaqSystems(rowIndex) = updateDaqSystem;
+                        newValue = obj.PageData.DaqSystems(rowIndex).Name;
+                        % Todo: Categoricals should dynamically update.
+                        % What about dropdown items...?
+                        obj.Widget.updateCellValue(rowIndex, 2, char(newValue))
+                    end
+            end
+
+            % disp(rowIndex)
+
+            % Todo: Get rowdata and rowIndex and add to event data...
+            % obj.notify('UserAction', evt); % Todo: use event?
+        end
+
+        function onTableCellValueChanged(obj, src, evt)
+            
+            switch evt.Indices(2)
+                case 1 % DAQ System type
+
+                    daqSystemNames = obj.getDaqSystemsForType(evt.NewData);
+                    names = [{'<Select DAQ System>', '<Load from File...>'}, daqSystemNames];
+
+                    dependentData = categorical(names(1), names);
+                    src.updateCellValue(evt.Indices(1), 2, dependentData)
+
+                case 2 % DAQ system name
+                    idx = evt.Indices(1);
+
+                    if strcmp(char(evt.NewData), '<Load from File...>')
+                        [fileName, folder] = uigetfile('*.json');
+                        if fileName==0
+                            newValue = '<Select DAQ System>';
+                            src.updateCellValue(evt.Indices(1), 2, newValue)
+                        else
+                            obj.PageData.DaqSystems(idx) = ...
+                                ndi.setup.DaqSystemConfiguration.fromConfigFile(fullfile(folder, fileName));
+                            newValue = obj.PageData.DaqSystems(idx).Name;
+                            src.updateCellValue(evt.Indices(1), 2, char(newValue))
+                        end
+                    elseif strcmp(char(evt.NewData), '<Select DAQ System>')
+                        %pass. Todo: reset
+
+                    else
+                         obj.PageData.DaqSystems(idx) = ...
+                             ndi.setup.DaqSystemConfiguration.fromDeviceName(evt.NewData);
+                    end
+
+
+                    % Load daq system from file...
+           
+                    % Todo: Update daqreader?
+            end
+        end
+
+        function onDAQSystemAdded(obj, srv, evt)
+            obj.PageData.DaqSystems(evt.RowIndex) = ndi.setup.DaqSystemConfiguration();
+        end
+
+        function onDAQSystemRemoved(obj, srv, evt)
+            obj.PageData.DaqSystems(evt.RowIndex) = [];
+        end
+
+        function postSetPageData(obj)
+        end
+    end
+
+    methods (Static)
+        function daqData = getDefaultDAQConfigTable()
+            
+            daqData = struct(...
+	            'DAQSystemType', "EPhys", ...
+                'Name', "", ...
+    	        'DAQReader', "n-trode", ...
+                'Edit', true);
+        
+            %todo
+            daqSystemTypes = {...
+                '<Select DAQ System Type>', ...
+                'Multifunction DAQ', ...
+                '2-Photon-Microscope', ...
+                'Electrophysiology'};
+            
+            [daqSystemNames, fileNames] = ndi.setup.daq.system.listDaqSystemNames();
+            names = [{'<Select DAQ System>', '<Load from File...>'}, daqSystemNames];
+
+            daqData.Name = categorical(names(1), names);
+            daqData.DAQSystemType = categorical({'<Select DAQ System Type>'}, daqSystemTypes);
+        
+            % Todo: filter by DAQSystemType
+            daqReaderTypes = ndi.setup.daq.listDaqReaders();
+            daqData.DAQReader = categorical(daqReaderTypes(1), daqReaderTypes);
+        
+            daqData = struct2table(daqData, "AsArray", true);
+        end
+
+        function daqSystemNames = getDaqSystemsForType(typeName)
+            % Todo: Should be accessible / easy access for editing
+            switch typeName
+                case '<Select DAQ System Type>'
+                    daqSystemNames = ...
+                        ndi.setup.daq.system.listDaqSystemNames();
+
+                case '2-Photon-Microscope'
+                    daqSystemNames = {'ScanImage', 'PrairieView'};
+
+                case 'Multifunction DAQ'
+                    daqSystemNames = {};
+
+                case 'Electrophysiology'
+                    daqSystemNames = ...
+                        ndi.setup.daq.system.listDaqSystemNames();
+            end
+        end
+
+        function tbl = convertDaqSystemObjectToTable(daqSystemConfig)
+            tbl = ndi.dataset.gui.pages.DaqSystemsPage.getDefaultDAQConfigTable();
+
+            numItems = numel(daqSystemConfig);
+            tbl = repmat(tbl, numItems, 1);
+
+            [daqReaderTypes, ~, fcnNames] = ndi.setup.daq.listDaqReaders();
+
+            for i = 1:numItems
+                if daqSystemConfig(i).Name == ""
+                    tbl{i, "Name"} = "<Select DAQ System>";
+                else
+                    tbl{i, "Name"} = daqSystemConfig(i).Name;
+                end
+
+                % Match daq reader short names and fullnames?
+                isMatch = strcmp(daqSystemConfig(i).DaqReaderClass, fcnNames);
+                tbl{i, "DAQReader"} = daqReaderTypes(isMatch);
+
+                %todo: set type...
+            end
+        end
+    end
+end
\ No newline at end of file
diff --git a/+ndi/+dataset/+gui/+pages/DatasetPage.m b/+ndi/+dataset/+gui/+pages/DatasetPage.m
new file mode 100644
index 000000000..b6a2d51fb
--- /dev/null
+++ b/+ndi/+dataset/+gui/+pages/DatasetPage.m
@@ -0,0 +1,127 @@
+classdef DatasetPage < ndi.gui.window.wizard.abstract.Page
+
+    properties (Constant)
+        Name = 'Dataset'
+        Title = "Create Dataset"
+        Description = "Initialize an NDI Dataset"
+    end
+
+    properties
+        %DataModel ndi.dataset.gui.models.DatasetInfo
+    end
+    properties (SetAccess = ?ndi.gui.window.wizard.WizardApp)
+        PageData ndi.dataset.gui.models.DatasetInfo
+    end
+
+    properties (Access = public, Dependent)
+        DatasetTitle (1,1) string % Title of dataset
+        DatasetRootPath (1,1) string % Root directory of a dataset
+        DatasetRootPathLog (1,:) string
+    end
+
+    properties (Access = private) % App components
+        GridLayout
+        DatasetWidgets ndi.dataset.gui.pages.component.DatasetComponent
+    end
+
+    
+    methods % Constructor
+        function obj = DatasetPage(pageData)
+            arguments
+                pageData ndi.dataset.gui.models.DatasetInfo = ...
+                    ndi.dataset.gui.models.DatasetInfo()
+            end
+
+            obj.PageData = pageData;
+        end
+    end
+
+    methods
+        function set.DatasetRootPath(obj, newValue)
+            obj.setPropertyValue("DatasetRootPath", newValue)
+        end
+        function value = get.DatasetRootPath(obj)
+            value = obj.getPropertyValue("DatasetRootPath");
+        end
+
+        function set.DatasetTitle(obj, newValue)
+            obj.setPropertyValue("DatasetTitle", newValue)
+        end
+        function value = get.DatasetTitle(obj)
+            value = obj.getPropertyValue("DatasetTitle");
+        end
+
+        function set.DatasetRootPathLog(obj, newValue)
+            obj.setPropertyValue("DatasetRootPathLog", newValue)
+        end
+        function value = get.DatasetRootPathLog(obj)
+            value = obj.DatasetWidgets.getFolderHistory();
+        end
+    end
+
+    methods (Access = protected)
+        
+        function setPropertyValue(obj, propertyName, propertyValue)
+            if ~isempty(obj.PageData)
+                obj.PageData.(propertyName) = propertyValue;
+            end
+            if obj.IsInitialized
+                obj.DatasetWidgets.(propertyName) = propertyValue;
+            end
+        end
+
+        function propertyValue = getPropertyValue(obj, propertyName)
+            if obj.IsInitialized
+                propertyValue = obj.DatasetWidgets.(propertyName);
+            else
+                if isprop(obj.PageData, propertyName)
+                    propertyValue = obj.PageData.(propertyName);
+                else
+                    propertyValue = "";
+                end
+            end
+        end
+
+        function onPageEntered(obj)
+            % Subclasses may override
+        end
+
+        function onPageExited(obj)
+            % Subclasses may override
+        end
+
+        function createComponents(obj)
+            obj.GridLayout = uigridlayout(obj.UIPanel);
+            obj.GridLayout.ColumnWidth = {'1x'};
+            obj.GridLayout.RowHeight = {'1x'};
+            obj.GridLayout.Padding = 0;
+
+            obj.DatasetWidgets = ndi.dataset.gui.pages.component.DatasetComponent(obj.GridLayout);
+            obj.DatasetWidgets.Layout.Row = 1;
+            obj.DatasetWidgets.Layout.Column = 1;
+
+            obj.DatasetWidgets.DatasetTitleValueChangedFcn = @obj.onDatasetTitleValueChanged;
+            obj.DatasetWidgets.DatasetRootPathValueChangedFcn = @obj.onDatasetRootPathValueChanged;
+
+            if isprop(obj.PageData, "DatasetTitle")
+                obj.DatasetWidgets.DatasetTitle = obj.PageData.DatasetTitle;
+            end
+            if isprop(obj.PageData, "DatasetRootPath")
+                obj.DatasetWidgets.DatasetRootPath = obj.PageData.DatasetRootPath;
+            end
+            if isprop(obj.PageData, "DatasetRootPathLog")
+                obj.DatasetWidgets.setFolderHistory(obj.PageData.DatasetRootPathLog);
+            end
+        end
+    end
+
+    methods (Access = private)
+        function onDatasetTitleValueChanged(obj, src, ~)
+            obj.DatasetTitle = src.DatasetTitle;
+        end
+        function onDatasetRootPathValueChanged(obj, src, ~)
+            obj.DatasetRootPath = src.DatasetRootPath;
+        end
+    end
+end
+
diff --git a/+ndi/+dataset/+gui/+pages/FolderOrganizationPage.m b/+ndi/+dataset/+gui/+pages/FolderOrganizationPage.m
new file mode 100644
index 000000000..ed5ead151
--- /dev/null
+++ b/+ndi/+dataset/+gui/+pages/FolderOrganizationPage.m
@@ -0,0 +1,246 @@
+classdef FolderOrganizationPage < ndi.gui.window.wizard.abstract.Page
+
+% Todo:
+%   Pass button through the subfolder preview functions?
+
+    properties (Constant)
+        Name = "Subfolders"
+        Title = "Folder Organization"
+        Description = "Specify how subfolders are organized"
+    end
+
+    properties % UI Data 
+        RootDirectory
+        DataModel
+        PresetFolderModels (1,:) string
+    end
+
+    properties (Access = private) % Custom UI Components
+        UITable ndi.dataset.gui.pages.component.FolderOrganizationTable
+        UIToolbar ndi.dataset.gui.pages.component.FolderOrganizationToolbar
+    end
+
+    properties (Access = private) % Generic UI Components
+        ContextMenu
+        SaveMenu
+        LoadMenu
+    end
+
+    properties (Access = private)
+        FolderListViewer
+        FolderListViewerActive = false
+        FolderOrganizationFilterListener
+    end
+
+    methods
+        function obj = FolderOrganizationPage( )
+            obj.DoCreatePanel = true;
+        end
+    end
+
+    methods
+        function set.DataModel(obj, dataModel)
+            obj.DataModel = dataModel;
+            if obj.IsInitialized
+                obj.UITable.SubfolderStructure = dataModel.FolderLevels; %#ok<MCSUP>
+            end
+        end
+
+        function set.RootDirectory(obj, rootDirectory)
+            obj.RootDirectory = rootDirectory;
+            if obj.IsInitialized
+                obj.UITable.RootDirectory = rootDirectory; %#ok<MCSUP>
+            end
+        end
+
+        function set.PresetFolderModels(obj, value)
+            obj.PresetFolderModels = value;
+            if obj.IsInitialized
+                obj.UIToolbar.PresetFolderModels = value; %#ok<MCSUP>
+            end
+        end
+    end
+
+    methods (Access = protected)
+
+        function onVisiblePropertyValueSet(obj)
+            onVisiblePropertyValueSet@ndi.gui.window.wizard.abstract.Page(obj)
+
+            if ~isempty(obj.UIToolbar)
+                obj.UIToolbar.Visible = obj.Visible;
+            end
+        end
+
+        function onPageEntered(obj)
+            % Subclasses may override
+        end
+
+        function onPageExited(obj)
+            % Update model data based on UITable data.
+            if obj.IsInitialized
+                S = obj.UITable.getSubfolderStructure();
+                if ~isempty(obj.DataModel)
+                    obj.DataModel.updateFolderLevelFromStruct(S)
+                end
+            end
+        end
+
+        function createComponents(obj)
+        % createComponents - Create components for page.   
+
+            args = { 'Parent', obj.UIPanel };
+            
+            obj.UITable = ndi.dataset.gui.pages.component.FolderOrganizationTable(obj.DataModel, args{:});
+            obj.UITable.hideAdvancedOptions()
+            if ~isempty(obj.RootDirectory)
+                obj.UITable.RootDirectory = obj.RootDirectory;
+            end
+
+            obj.UIToolbar = ndi.dataset.gui.pages.component.FolderOrganizationToolbar(obj.ParentApp.BodyGridLayout);
+            obj.UIToolbar.Layout.Row = 2;
+            obj.UIToolbar.Layout.Column = 1;
+            obj.UIToolbar.Theme = obj.ParentApp.Theme;
+            
+            % Set callback functions
+            obj.UIToolbar.MenuButtonPushedFcn = @obj.onMenuButtonPushed;
+            obj.UIToolbar.ShowFiltersButtonPushedFcn = @obj.onShowFiltersButtonPushed;
+            obj.UIToolbar.PreviewButtonPushedFcn = @obj.onFolderPreviewButtonClicked;
+            obj.UIToolbar.SelectTemplateDropDownValueChangedFcn = @obj.onPresetTemplateSelected;
+
+            % Todo:
+            obj.ContextMenu = uicontextmenu(obj.ParentApp.UIFigure);
+
+            obj.SaveMenu = uimenu(obj.ContextMenu);
+            %obj.SaveMenu.MenuSelectedFcn = createCallbackFcn(obj, @DiseaseMenuSelected, true);
+            obj.SaveMenu.Text = 'Save to template file';
+
+            obj.LoadMenu = uimenu(obj.ContextMenu);
+            %obj.LoadMenu.MenuSelectedFcn = createCallbackFcn(obj, @DiseaseMenuSelected, true);
+            obj.LoadMenu.Text = 'Load from template file';
+        end
+
+        function onMenuButtonPushed(obj, event)
+            pos = getpixelposition(event.Source, true);
+            obj.ContextMenu.open(pos(1)+12, pos(2)-5)
+        end
+        
+        function onShowFiltersButtonPushed(obj, event)
+            if event.Value
+                obj.UITable.showAdvancedOptions()
+            else
+                obj.UITable.hideAdvancedOptions()
+            end
+        end
+        
+        function onFolderPreviewButtonClicked(obj, event)
+        %onFolderPreviewButtonClicked Button callback
+        %
+        %   This callback toggles visibility a figure that displays all the
+        %   folders that are detected using current configuration
+        
+            if ~isempty(obj.FolderListViewer) && isvalid(obj.FolderListViewer)
+                if strcmp(obj.FolderListViewer.Visible, 'on')
+                    obj.FolderListViewerActive = false;
+                    obj.hideFolderListViewer()
+                    event.Source.FontWeight = 'normal';
+                elseif strcmp(obj.FolderListViewer.Visible, 'off')
+                    obj.FolderListViewerActive = true;
+                    obj.showFolderListViewer()
+                    event.Source.FontWeight = 'bold';
+                end
+            else
+                obj.FolderListViewerActive = true;
+                obj.showFolderListViewer()
+                event.Source.FontWeight = 'bold';
+            end
+        end
+
+        function onPresetTemplateSelected(obj, event)
+            filePath = obj.ParentApp.PresetFolderModels( event.Value );
+            folderModel = ndi.dataset.gui.models.FolderOrganizationModel.fromJson(filePath);
+            obj.UITable.SubfolderStructure = folderModel.FolderLevels;
+        end
+    end
+
+    % % % % Methods for the folder listing figure and table
+    methods (Access = private) 
+
+        function createFolderListViewer(obj)
+
+            obj.FolderListViewer = nansen.config.dloc.FolderPathViewer(obj.ParentApp.UIFigure);
+            obj.FolderListViewer.Theme = obj.ParentApp.Theme;
+            
+            addlistener(obj.FolderListViewer, 'ObjectBeingDestroyed', ...
+                @(s, e) obj.onFolderListViewerDeleted);
+            
+            obj.FolderOrganizationFilterListener = listener(obj.UITable, ...
+                'FilterChanged', @(s,e) obj.updateFolderList);
+            
+            % Give focus to the app figure
+            figure(obj.ParentApp.UIFigure)
+        end
+    
+        function showFolderListViewer(obj)
+                        
+            [screenSize, ~] = ndi.gui.utility.getCurrentScreenSize(obj.ParentApp.UIFigure);
+            obj.ParentApp.UIFigure.Position(1) = screenSize(1) + 10;
+
+            if isempty(obj.FolderListViewer) || ~isvalid(obj.FolderListViewer)
+                obj.createFolderListViewer()
+                obj.updateFolderList()
+            end
+            
+            %obj.PreviewButton.ImageSource = nansen.internal.getIconPathName('look3.png');
+            obj.FolderListViewer.Visible = 'on';
+            pause(0.01)
+            
+            if ~isempty(obj.ParentApp.UIFigure)
+                figure(obj.ParentApp.UIFigure)
+            end
+        end
+                
+        function hideFolderListViewer(obj)
+            
+            if ~isempty(obj.FolderListViewer) && isvalid(obj.FolderListViewer)
+                %obj.PreviewButton.ImageSource = nansen.internal.getIconPathName('look2.png');
+                obj.FolderListViewer.Visible = 'off';
+
+                if ~isempty(obj.ParentApp.UIFigure)
+                    ndi.gui.utility.centerFigureOnScreen(obj.ParentApp.UIFigure)
+                end
+            end
+        end
+        
+        function onFolderListViewerDeleted(obj)
+            if ~isvalid(obj); return; end
+            
+            obj.FolderListViewerActive = false;
+            %obj.PreviewButton.ImageSource = nansen.internal.getIconPathName('look2.png');
+            obj.FolderListViewer = [];
+        end
+
+        function updateFolderList(obj)
+        
+            if isempty(obj.FolderListViewer) || ~isvalid(obj.FolderListViewer)
+                return
+            end
+            
+            % Make sure data location model is updated with current values
+            S = obj.UITable.getSubfolderStructure();
+            folderPath = cellstr(obj.RootDirectory);
+
+            for i = 1:numel(S)
+                [folderPath, ~] = utility.path.listSubDir(...
+                    folderPath, S(i).Expression, S(i).IgnoreList);
+            end
+
+            if isempty(folderPath); folderPath = {''}; end
+            
+            % Remove the root path from the displayed paths.
+            folderPath = strrep(folderPath, obj.RootDirectory, sprintf('<Dataset>'));
+            
+            % Update table data in folderlist viewer
+            obj.FolderListViewer.Data = folderPath';
+        end
+    end  
+end
\ No newline at end of file
diff --git a/+ndi/+dataset/+gui/+pages/IntroPage.m b/+ndi/+dataset/+gui/+pages/IntroPage.m
new file mode 100644
index 000000000..aedbc1953
--- /dev/null
+++ b/+ndi/+dataset/+gui/+pages/IntroPage.m
@@ -0,0 +1,68 @@
+classdef IntroPage < ndi.gui.window.wizard.abstract.Page
+
+
+    properties (Constant)
+        Name = "Intro"
+        Title = "Welcome"
+        Description = [...
+            "This dialog will guide you through the initialization of an NDI dataset\n\n" + ...
+            "The aims are:\n" + ...
+            "  1. Locate dataset\n" + ...
+            "  2. Specify how dataset is organized\n" + ...
+            "  3. Assign DAQ Systems" ]
+
+    end
+
+    properties (Access = private) % App components
+        GridLayout
+        StartButton
+    end
+    
+    methods
+        function obj = IntroPage()
+            obj.ShowNavigationButtons = false;
+            obj.DoCreatePanel = true;
+        end
+    end
+
+    methods (Access = protected)
+        function onPageEntered(obj)
+            % Subclasses may override
+            obj.ParentApp.DescriptionLabel.Layout.Row = [1,2];
+        end
+
+        function onPageExited(obj)
+            % Subclasses may override
+            obj.ParentApp.DescriptionLabel.Layout.Row = [1];
+        end
+
+        function createComponents(obj)
+            obj.UIPanel.BorderType = 'none';
+
+            obj.GridLayout = uigridlayout(obj.UIPanel);
+            obj.GridLayout.ColumnWidth = {'1x', 150, '1x'};
+            obj.GridLayout.RowHeight = {'2x', 50, '1x'};
+            obj.GridLayout.Padding = 0;
+            %obj.GridLayout.Layout.Row = 3;
+            %obj.GridLayout.Layout.Column = 1;
+            obj.GridLayout.BackgroundColor = obj.ParentApp.BodyGridLayout.BackgroundColor;
+
+            obj.StartButton = uibutton( obj.GridLayout, 'push' );
+            obj.StartButton.Layout.Row = 2;
+            obj.StartButton.Layout.Column = 2;
+            obj.StartButton.ButtonPushedFcn = @(s,e) obj.changePage;
+
+            obj.StartButton.BackgroundColor = ndi.gui.internal.theme.NDITheme.PrimaryColorA;
+            obj.StartButton.FontColor = ndi.gui.internal.theme.NDITheme.SecondaryColorC;
+            obj.StartButton.FontSize = 16;
+            obj.StartButton.Text = "Get Started";
+
+        end
+
+        function changePage(obj)
+            obj.ParentApp.changeWizardPage([], 2)
+        end
+    end
+
+
+end
\ No newline at end of file
diff --git a/+ndi/+dataset/+gui/+pages/MetadataPage.m b/+ndi/+dataset/+gui/+pages/MetadataPage.m
new file mode 100644
index 000000000..3ce3c8338
--- /dev/null
+++ b/+ndi/+dataset/+gui/+pages/MetadataPage.m
@@ -0,0 +1,28 @@
+classdef MetadataPage < ndi.gui.window.wizard.abstract.Page
+
+
+    properties (Constant)
+        Name = "Metadata"
+        Title = "Metadata"
+        Description = "Specify how to extract metadata from foldernames"
+    end
+
+    
+    methods
+        function obj = MetadataPage()
+
+        end
+    end
+
+    methods (Access = protected)
+        function onPageEntered(obj)
+            % Subclasses may override
+        end
+
+        function onPageExited(obj)
+            % Subclasses may override
+        end
+    end
+
+
+end
\ No newline at end of file
diff --git a/+ndi/+dataset/+gui/+pages/SubjectPage.m b/+ndi/+dataset/+gui/+pages/SubjectPage.m
new file mode 100644
index 000000000..50f8b8743
--- /dev/null
+++ b/+ndi/+dataset/+gui/+pages/SubjectPage.m
@@ -0,0 +1,182 @@
+classdef SubjectPage < ndi.gui.window.wizard.abstract.Page
+
+    properties (Constant)
+        Name = 'Subject'
+        Title = "Edit Subjects"
+        Description = "Enter subject details"
+    end
+
+    properties (SetAccess = ?ndi.gui.window.wizard.WizardApp)
+        PageData % ndi.dataset.gui.models.DatasetInfo
+    end
+
+    properties % UI Data % TODO: move to model?
+        RootDirectory
+    end
+ 
+
+    properties (Access = public, Dependent)
+        DatasetRootPath (1,1) string % Root directory of a dataset
+    end
+
+    properties (Access = private) % App components
+        GridLayout
+        DatasetWidgets %ndi.dataset.gui.pages.component.DatasetComponent
+    end
+
+    
+    methods % Constructor
+        function obj = SubjectPage()
+            %obj.PageData = ndi.dataset.gui.models.DatasetInfo();
+        end
+    end
+
+    methods
+        function set.DatasetRootPath(obj, newValue)
+            obj.setPropertyValue("DatasetRootPath", newValue)
+        end
+        function value = get.DatasetRootPath(obj)
+            value = obj.getPropertyValue("DatasetRootPath");
+        end
+    end
+
+    methods (Access = protected)
+        
+        function setPropertyValue(obj, propertyName, propertyValue)
+            if ~isempty(obj.PageData)
+                obj.PageData.(propertyName) = propertyValue;
+            end
+            if obj.IsInitialized
+                obj.DatasetWidgets.(propertyName) = propertyValue;
+            end
+        end
+
+        function propertyValue = getPropertyValue(obj, propertyName)
+            if obj.IsInitialized
+                propertyValue = obj.DatasetWidgets.(propertyName);
+            else
+                if isprop(obj.PageData, propertyName)
+                    propertyValue = obj.PageData.(propertyName);
+                else
+                    propertyValue = "";
+                end
+            end
+        end
+
+        function onPageEntered(obj)
+            % Subclasses may override
+        end
+
+        function onPageExited(obj)
+            % Subclasses may override
+        end
+
+        function createComponents(obj)
+            obj.GridLayout = uigridlayout(obj.UIPanel);
+            obj.GridLayout.ColumnWidth = {'1x'};
+            obj.GridLayout.RowHeight = {'1x'};
+            obj.GridLayout.BackgroundColor = 'w';
+            obj.GridLayout.Padding = 10;
+
+            datasetFolder = obj.DatasetRootPath;
+            app.Dataset = ndi.dataset.dir('test', char(datasetFolder));
+            
+            subjectData = ndi.database.metadata_app.fun.loadSubjects(app.Dataset);
+            subjectTableData = subjectData.formatTable();
+
+            instanceTable = openminds.internal.listControlledInstances('BiologicalSex');
+            options = instanceTable.InstanceName;
+
+            % Todo: Do subjects have sex from before?
+            subjectTableData(1).BiologicalSex = categorical({'male'}, options);
+            subjectTableData(2).BiologicalSex = categorical({'female'}, options);
+            
+            
+            % Create the WidgetTable component
+            widgetTable = WidgetTable(obj.GridLayout, ...
+                HeaderBackgroundColor="#FFFFFF", ...
+                HeaderForegroundColor = "#002054", ...
+                BackgroundColor = 'white', ...
+                TableBorderType='none');
+            
+
+            allStrains = ndi.database.metadata_ds_core.conversion.getAllStrains();
+            allInstancesCell = allStrains.values();
+            metadataCollection = openminds.Collection(allInstancesCell{:});
+            
+            subjectTableData(1).Species = openminds.controlledterms.Species.empty;
+            subjectTableData(2).Species = openminds.controlledterms.Species();
+
+            subjectTableData(1).Strain = allStrains('aqp4ko');
+            subjectTableData(1).Species = subjectTableData(1).Strain.species;
+            subjectTableData(2).Strain = openminds.core.Strain();
+            subjectTableData(2).Species = subjectTableData(2).Strain.species;
+
+            
+            strainDrodownFcn = @(h, varargin) om.internal.control.InstanceDropDown(h, ...
+                "MetadataType", 'openminds.core.research.Strain', ...
+                "MetadataTypeConstraint", om.internal.InstanceFilter, ...
+                "MetadataCollection", metadataCollection, ...
+                "ActionButtonType", "InstanceEditorButton");
+            speciesDropdownFcn = @(h, varargin) om.internal.control.InstanceDropDown(h, ...
+                "MetadataType", 'openminds.controlledterms.Species', ...
+                "MetadataCollection", metadataCollection, ...
+                "ActionButtonType", "InstanceEditorButton", ...
+                "CustomActions", om.internal.control.action.NCBITaxonSearch);
+
+            widgetTable.ColumnWidget = {'', '', speciesDropdownFcn, strainDrodownFcn};
+            widgetTable.Data = subjectTableData;
+            widgetTable.CellEditedFcn = @obj.onCellEdited;
+        end
+
+        function onCellEdited(obj, src, evt)
+            varNames = src.VariableNames;
+        
+            switch varNames{ evt.Indices(2) }
+                case 'Species'
+                    dependentColumnIndex = find(strcmp(varNames, 'Strain'));
+                    %rowIdx = evt.Indices(1);
+
+                    hControl = src.getRowControl(evt.DisplayIndices(1), dependentColumnIndex);
+                    newConstraint = hControl.MetadataTypeConstraints;
+                    newConstraint.FilterCondition = char(evt.NewData);
+                    hControl.MetadataTypeConstraints = newConstraint;
+            end
+        end
+
+        function updateStrainInstances(obj)
+        %function populateStrainList(app)
+            if isempty(app.SpeciesListBox.Value) || ismissing(app.SpeciesListBox.Value)
+                items = "Select a Species";
+            else
+                species = app.SpeciesListBox.Value;
+                strainCatalog = getStrainInstances(app);
+                if strainCatalog.NumItems == 0
+                    items = "No Strains Available";
+                else
+                    allStrains = string( {strainCatalog(:).species} );
+                    %[~, allStrains] = fileparts(allStrains);
+    
+                    keep = allStrains == species;
+    
+                    if ~any(keep)
+                        items = "No Strains Available";
+                    else
+                        items = string( {strainCatalog(keep).name} );
+                    end
+                end       
+            end
+            app.StrainListBox.Items = items;
+        end
+    end
+
+    methods (Access = private)
+        function onDatasetTitleValueChanged(obj, src, ~)
+            obj.DatasetTitle = src.DatasetTitle;
+        end
+        function onDatasetRootPathValueChanged(obj, src, ~)
+            obj.DatasetRootPath = src.DatasetRootPath;
+        end
+    end
+end
+
diff --git a/+ndi/+dataset/+gui/DatasetWizardApp.m b/+ndi/+dataset/+gui/DatasetWizardApp.m
new file mode 100644
index 000000000..f57ddae7a
--- /dev/null
+++ b/+ndi/+dataset/+gui/DatasetWizardApp.m
@@ -0,0 +1,231 @@
+classdef DatasetWizardApp < ndi.gui.window.wizard.WizardApp
+% DatasetWizardApp - Class providing an app for configuring an NDI Dataset
+
+% This is a multi-page wizard app. Each page connects a data model with a
+% gui / page object for manipulating / modifying the model.
+%
+% This app holds the AppData. The AppData contains all the configurations
+% necessary for a dataset. It has subfields that represents specific
+% models, and these models are assigned to pages.
+%
+% AppData is a class. It loads everything to/from jsons. Ideally, it would
+% initialize the .ndi database and already work with ndi-documents, but for
+% now we load and save to non-ndi json documents.
+
+
+% Questions:
+% Daq Systems are added to sessions. Can we add a daq system configuration
+% to the dataset's database?
+
+    % Responsibility
+    % Keep cross-page dependencies synched
+    % Export data from gui
+    % Import data to gui
+
+
+    properties (SetAccess = private)
+        DatasetRootDirectory (1,1) string = missing
+        AppData ndi.dataset.gui.NDIDatasetConfiguration
+        Preferences ndi.dataset.gui.Preferences
+    end
+
+    properties (Access = protected)
+        Title = "NDI Dataset Wizard"
+        PageNames = [...
+            "ndi.dataset.gui.pages.IntroPage", ...
+            "ndi.dataset.gui.pages.DatasetPage", ...
+            "ndi.dataset.gui.folderorganization.FolderOrganizationPage", ...
+            "ndi.dataset.gui.pages.SubjectPage", ...
+            "ndi.dataset.gui.pages.DaqSystemsPage" ...
+            ] %"ndi.dataset.gui.pages.MetadataPage", ...
+                    %"ndi.dataset.gui.pages.FolderOrganizationPage", ...
+
+    end
+
+    properties (Constant, Access = protected)
+        AppPath = fileparts( mfilename('fullpath') )
+        LogoFilePath = ndi.gui.utility.internal.getLogoPath('ndi_cloud', 'dark')
+        % LoadingComponent % Todo
+        MinimumSize = [750, 550]
+    end
+
+    properties (Access = private)
+        RootDirectoryListener event.listener
+    end
+
+    methods
+        function app = DatasetWizardApp( datasetFolder )
+
+            arguments
+                datasetFolder (1,1) string = missing
+            end
+            
+            if exist('wt.FileSelector', 'class') ~= 8
+                ndi.internal.setup.installWidgetsToolbox()
+            end
+        
+            if ~ismissing(datasetFolder)
+                app.DatasetRootDirectory = datasetFolder;
+            end
+
+            app.loadPreferences()
+
+            if ~nargout; clear app; end
+        end
+    end
+
+    methods % Property set method
+        function set.DatasetRootDirectory(app, newValue)
+            app.DatasetRootDirectory = newValue;
+            app.onDatasetRootDirectorySet()
+        end
+    end
+
+    methods (Access = protected) % Implement superclass (WizardApp) methods
+        function onPageCreated(app, pageObject)
+            switch class(pageObject)
+                case "ndi.dataset.gui.pages.DatasetPage"
+                    app.onDatasetPageCreated( pageObject )
+                case "ndi.dataset.gui.pages.FolderOrganizationPage"
+                    app.onFolderOrganizationPageCreated( pageObject )
+                case "ndi.dataset.gui.pages.DaqSystemsPage"
+                    app.onDaqSystemsPageCreated( pageObject )
+            end
+        end
+    
+        function doAbort = onFigureCloseRequest(app, event)
+            
+            app.promptSaveCurrentChanges()
+            app.savePreferences()
+            doAbort = false;
+        end
+    
+        function loadTheme(app)
+            app.Theme = ndi.dataset.gui.WizardTheme();
+        end
+    end
+
+    methods (Access = private) % Page created callbacks
+        
+        % Dataset Page: Page created callback
+        function onDatasetPageCreated(app, pageObject)
+            if ~ismissing(app.DatasetRootDirectory)
+                pageObject.DatasetRootPath = app.DatasetRootDirectory;
+            end
+            app.RootDirectoryListener = listener(pageObject.PageData, ...
+                'DatasetRootPath', 'PostSet', @app.onRootDirectoryChanged);
+        end
+
+        function onFolderOrganizationPageCreated(app, pageObject)
+            referencePage = app.getPage("Create Dataset");
+            pageObject.RootDirectory = referencePage.DatasetRootPath;
+            %pageObject.PresetFolderModels = app.PresetFolderModels.keys();
+        end
+
+        function onDaqSystemsPageCreated(app, pageObject)
+            pageObject.EditDaqSystemFcn = @app.uiEditDaqSystem;
+        end
+    end
+
+    methods (Access = private) % Property changed callbacks
+        function onRootDirectoryChanged(app, ~, evt)
+            app.DatasetRootDirectory = evt.AffectedObject.(evt.Source.Name);
+        end
+
+        function onDatasetRootDirectorySet(app)
+
+            if ~isempty(app.AppData)
+                app.promptSaveCurrentChanges()
+            end
+
+            app.AppData = ndi.dataset.gui.NDIDatasetConfiguration(app.DatasetRootDirectory);
+
+            % Assign to all page modules...
+            page = app.getPage("Create Dataset");
+            page.PageData = app.AppData.DatasetInformation;
+
+            page = app.getPage("Folder Organization");
+            page.RootDirectory = app.DatasetRootDirectory;
+            page.DataModel = app.AppData.FolderModel;
+
+            % Assign daq systems
+            page = app.getPage("DAQ Systems");
+            page.PageData = app.AppData.DaqSystemsCollection;
+
+            page = app.getPage("Edit Subjects");
+            page.RootDirectory = app.DatasetRootDirectory;
+        end
+    end
+    
+    methods (Access = private) % Callbacks
+        function updatedDaqSystem = uiEditDaqSystem(app, daqSystem)
+            epochFolder = app.AppData.FolderModel.getExampleFolder();
+            if strcmp( app.AppData.FolderModel.FolderLevels(end).Type, "Epoch" )
+                epochOrganization = "nested";
+            else
+                epochOrganization = "flat";
+            end
+
+            hWaitbar = uiprogressdlg(app.UIFigure, "Indeterminate", "on", ...
+                "Message", "Please wait while opening DAQ System Configurator");
+            waitbarCleanupObj = onCleanup(@() delete(hWaitbar));
+
+            h = NDIDaqSystemConfig(app.DatasetRootDirectory, epochFolder, epochOrganization, daqSystem);
+            appCleanupObj = onCleanup(@() delete(h));
+            clear waitbarCleanupObj
+            
+            % Wait for user to finish editing
+            uiwait(h);
+            
+            % % Get updated data.
+            updatedDaqSystem = h.DaqSystemConfiguration;
+
+            clear appCleanupObj
+        end
+    end
+
+    methods (Access = private) 
+        function promptSaveCurrentChanges(app)
+            % Todo: Check if there are changes...
+            if isempty(app.AppData) || app.AppData.isClean()
+                return
+            end
+
+            answer = uiconfirm(app.UIFigure, ...
+                "Do you want to save changes for current dataset?", ...
+                "Save Changes?", ...
+                "Options", ["Yes", "No"], ...
+                "DefaultOption", "Yes", ...
+                "CancelOption", "No");
+            switch answer
+                case "Yes"
+                    app.AppData.save()
+                case "No"
+                    % pass
+            end
+        end
+    end
+
+    methods % Save/load preferences
+        
+        function loadPreferences(app)
+            app.Preferences = ndi.dataset.gui.Preferences.load( class(app), fullfile('ndi', 'dataset_wizard'));
+            app.UIFigure.Position = app.Preferences.Position;
+
+            referencePage = app.getPage("Create Dataset");
+            referencePage.DatasetRootPathLog = app.Preferences.DatasetFolderHistory;
+        end %loadPreferences
+        
+        function savePreferences(app)
+            app.Preferences.Position = app.UIFigure.Position;
+            
+            referencePage = app.getPage("Create Dataset");
+            if referencePage.IsInitialized
+                app.Preferences.DatasetFolderHistory = referencePage.DatasetRootPathLog;
+            end
+
+            app.Preferences.save(class(app), fullfile('ndi', 'dataset_wizard'));
+        end %savePreferences
+    end
+
+end
diff --git a/+ndi/+dataset/+gui/NDIDatasetConfiguration.m b/+ndi/+dataset/+gui/NDIDatasetConfiguration.m
new file mode 100644
index 000000000..ad02be281
--- /dev/null
+++ b/+ndi/+dataset/+gui/NDIDatasetConfiguration.m
@@ -0,0 +1,174 @@
+classdef NDIDatasetConfiguration < handle
+% NDIDatasetConfiguration - Class with properties and methods for
+% configuring an NDI dataset.
+%
+%   Configuring an NDI Dataset mainly consist of the following actions:
+%       1) Specify a dataset root folder
+%       2) Specify how dataset is organized in subfolders
+%       3) Extracting identifiers / tokens from foldernames
+%       4) Configuring DAQ systems for the dataset.
+%
+%   This class can be used from the command window, but there is also the
+%   app "ndi.dataset.gui.NDIDatasetWizardApp" which provides an interactive
+%   manner of configuring an NDI dataset.
+
+    properties (SetAccess = private, SetObservable)
+        DatasetRootDirectory (1,1) string = missing
+        DatasetInformation ndi.dataset.gui.models.DatasetInfo
+        FolderModel ndi.dataset.gui.models.FolderOrganizationModel
+        MetadataExtractor
+        %DaqSystems (1,:) ndi.setup.DaqSystemConfiguration
+        DaqSystemsCollection ndi.dataset.gui.models.DaqSystemCollection
+    end
+
+    methods % Constructor
+        function obj = NDIDatasetConfiguration(datasetFolder)
+            arguments
+                datasetFolder (1,1) string = missing
+            end
+            
+            obj.DatasetRootDirectory = datasetFolder;
+        end
+    end
+
+    methods % User methods
+        function save(obj, filePath)
+            obj.saveDatasetConfiguration()
+        end
+
+        function tf = isClean(obj)
+            tf = false(1,3);
+
+            filePath = obj.getDatasetMetadataFile();
+            tf(1) = obj.DatasetInformation.isClean(filePath);
+            
+            filePath = obj.getFolderOrganizationConfigurationFile();
+            tf(2) = obj.FolderModel.isClean(filePath);
+
+            filePath = obj.getDaqSystemConfigurationFile();
+            tf(3) = obj.DaqSystemsCollection.isClean(filePath);
+
+            tf = all(tf);
+        end
+
+        function uigetdir(obj)
+            rootDirectory = uigetdir();
+            if ~rootDirectory == 0
+                obj.DatasetRootDirectory = rootDirectory;
+            end
+        end
+    end
+
+    methods % Property set methods
+        function set.DatasetRootDirectory(obj, newValue)
+            obj.DatasetRootDirectory = newValue;
+            obj.postSetDatasetRootDirectorySet()
+        end
+    end
+
+    methods (Access = private) % Property set callbacks
+        function postSetDatasetRootDirectorySet(obj)
+            if ~ismissing(obj.DatasetRootDirectory)
+                obj.loadDatasetConfiguration()
+            end
+            obj.FolderModel.RootDirectory = obj.DatasetRootDirectory;
+        end
+    end
+
+    methods (Access = private) % Internal
+        function initializeModels(obj)
+            obj.FolderModel = ndi.dataset.gui.models.FolderOrganizationModel();
+            %obj.FolderModel.addSubFolderLevel()
+        end
+
+        function loadDatasetConfiguration(obj)
+            
+            % Load dataset information
+            filePath = obj.getDatasetMetadataFile('nocreate');
+            if isfile(filePath)
+                S = load(filePath);
+                obj.DatasetInformation = S.DatasetInformation;
+            else
+                obj.DatasetInformation = ndi.dataset.gui.models.DatasetInfo();
+            end
+
+            % Load folder organization
+            filePath = obj.getFolderOrganizationConfigurationFile('nocreate');
+            if isfile(filePath)
+                obj.FolderModel = ndi.dataset.gui.models.FolderOrganizationModel.fromJson(filePath);
+            else
+                obj.FolderModel = ndi.dataset.gui.models.FolderOrganizationModel();
+                obj.FolderModel.addSubFolderLevel();
+            end
+
+            % Load DAQ systems
+            filePath = obj.getDaqSystemConfigurationFile('nocreate');
+            if isfile(filePath)
+                daqSystemModel = ndi.dataset.gui.models.DaqSystemCollection.fromJson(filePath);
+            else
+                daqSystemModel = ndi.dataset.gui.models.DaqSystemCollection();
+            end
+            obj.DaqSystemsCollection = daqSystemModel;
+        end
+
+        function saveDatasetConfiguration(obj)
+            filePath = obj.getFolderOrganizationConfigurationFile();
+            obj.FolderModel.toJson(filePath)
+
+            filePath = obj.getDaqSystemConfigurationFile();
+            obj.DaqSystemsCollection.toJson(filePath)
+
+            % Save dataset information
+            filePath = obj.getDatasetMetadataFile();
+            S = struct('DatasetInformation', obj.DatasetInformation);
+            save(filePath, "-struct", "S")
+        end
+
+        function pathName = getDatasetSubfolder(obj, subfolder, mode)
+            arguments
+                obj (1,1) ndi.dataset.gui.NDIDatasetConfiguration
+                subfolder (1,1) string
+                mode (1,1) string {mustBeMember(mode, ["create", "nocreate"])} = "create"
+            end
+            pathName = fullfile(obj.DatasetRootDirectory, '.ndi', subfolder);
+            if mode == "create"
+                if ~isfolder(pathName)
+                    mkdir(pathName)
+                end
+            else
+                % pass
+            end
+        end
+
+        function pathName = getDatasetConfigurationFolder(obj, mode)
+            pathName = obj.getDatasetSubfolder('configuration', mode);
+        end
+
+        function pathName = getFolderOrganizationConfigurationFile(obj, mode)
+            arguments
+                obj (1,1) ndi.dataset.gui.NDIDatasetConfiguration
+                mode (1,1) string {mustBeMember(mode, ["create", "nocreate"])} = "create"
+            end
+            configFolder = obj.getDatasetConfigurationFolder(mode);
+            pathName = fullfile(configFolder, 'folder_organization_spec.json');
+        end
+
+        function pathName = getDaqSystemConfigurationFile(obj, mode)
+            arguments
+                obj (1,1) ndi.dataset.gui.NDIDatasetConfiguration
+                mode (1,1) string {mustBeMember(mode, ["create", "nocreate"])} = "create"
+            end
+            configFolder = obj.getDatasetConfigurationFolder(mode);
+            pathName = fullfile(configFolder, 'daq_system_spec.json');
+        end
+
+        function pathName = getDatasetMetadataFile(obj, mode)
+            arguments
+                obj (1,1) ndi.dataset.gui.NDIDatasetConfiguration
+                mode (1,1) string {mustBeMember(mode, ["create", "nocreate"])} = "create"
+            end
+            configFolder = obj.getDatasetSubfolder('metadata', mode);
+            pathName = fullfile(configFolder, 'DatasetMetadata.mat');
+        end
+    end
+end
\ No newline at end of file
diff --git a/+ndi/+dataset/+gui/Preferences.m b/+ndi/+dataset/+gui/Preferences.m
new file mode 100644
index 000000000..f8aa9a05d
--- /dev/null
+++ b/+ndi/+dataset/+gui/Preferences.m
@@ -0,0 +1,35 @@
+classdef Preferences < handle
+
+    properties
+        % Starting window position
+        Position (1,4) double = [100 100 1000 700]
+
+        DatasetFolderHistory (1,:) string
+
+        FolderOrganizationTemplates (1,1) dictionary
+    end
+
+    methods
+        function save(obj, className, subFolder)
+            folderPath = fullfile(prefdir, subFolder);
+            if ~isfolder(folderPath); mkdir(folderPath); end
+            filename = fullfile(folderPath, strrep(className, '.', '_'));
+            filename = [filename, '.mat'];
+            save(filename, "obj")
+        end
+    end
+
+    methods (Static)
+        function obj = load(className, subFolder)
+            folderPath = fullfile(prefdir, subFolder);
+            filename = fullfile(folderPath, strrep(className, '.', '_'));
+            filename = [filename, '.mat'];
+            if isfile(filename)
+                S = load(filename, "obj");
+                obj = S.obj;
+            else
+                obj = ndi.dataset.gui.Preferences();
+            end
+        end
+    end
+end
\ No newline at end of file
diff --git a/+ndi/+dataset/+gui/WizardTheme.m b/+ndi/+dataset/+gui/WizardTheme.m
new file mode 100644
index 000000000..551ca2a1c
--- /dev/null
+++ b/+ndi/+dataset/+gui/WizardTheme.m
@@ -0,0 +1,18 @@
+classdef WizardTheme < ndi.gui.window.wizard.abstract.Theme
+
+    properties (Constant)
+        FontName = 'helvetica';
+        PrimaryColor = ndi.gui.internal.theme.NDITheme.PrimaryColorA
+        HeaderBgColor = ndi.gui.internal.theme.NDITheme.PrimaryColorA;
+        HeaderMidColor = ndi.gui.internal.theme.NDITheme.PrimaryColorB
+        HeaderFgColor = ndi.gui.internal.theme.NDITheme.SecondaryColorC
+        
+        %FigureBgColor = ndi.gui.internal.theme.NDITheme.SecondaryColorC
+        FigureBgColor = [246,248,252]/255;
+        FigureFgColor = ndi.gui.internal.theme.NDITheme.PrimaryColorA
+        
+        MatlabBlue = [16,119,166]/255;
+        ControlPanelsBgColor = [1,1,1];
+    end
+end
+
diff --git a/+ndi/+dataset/+gui/getTooltipMessage.m b/+ndi/+dataset/+gui/getTooltipMessage.m
new file mode 100644
index 000000000..ce567cf5e
--- /dev/null
+++ b/+ndi/+dataset/+gui/getTooltipMessage.m
@@ -0,0 +1,59 @@
+function msg = getTooltipMessage(keyword)
+% getTooltipMessage - Returns a tooltip / help message for a given keyword
+
+
+switch keyword
+    
+% % Folder organization page
+
+    case 'Select subfolder example'
+        msg = {'Select a subfolder from the list to use as an example', ...
+            'for the folder hierarchy which your data is organized after.'};
+        
+    case 'Set subfolder type'
+        msg = {'Choose which type the selected subfolder is'};
+
+    case 'Exclusion list'
+        msg = {'Enter a word or a comma-separated list of words to ignore.\n', ...
+            '\nAll folders containing one or more words in this list', ...
+            'will be excluded from the list of detected folders.\n', ...
+            '\nNote: Each input row corresponds to a subfolder level'};
+        
+    case 'Inclusion list'
+        msg = {'Enter a word/expression to only include folders matching', ...
+            'that word/expression.\n', ...
+            '\nThe expression can contain the wildcard (*) character,'...
+            'and the # symbol can be used to substitute numbers. See', ...
+            'matlab''s regexp function for a complete overview of valid', ...
+            'expressions.\n', ...
+            '\nExample: If a folder is named "session_123_training"', ...
+            'the expression could be session_###. In that case, only', ...
+            'folders containing the word session followed by three numbers', ...
+            'will be included in the detected folder list.'};
+        
+% % DAQ Systems page
+
+    case 'Select Data Source'
+        msg = "Select a DAQ system that was used for data collection";
+
+    case 'Select Data Reader'
+        msg = "Select a class / interface to use for reading data";
+
+    case 'File Parameters'
+        msg = {'Enter all file parameters (as a comma separated list)', ...
+               'that are needed for this DAQ System.\n', ...
+               '\nNote: You can enter any regexp expression'};
+
+    otherwise
+        msg = 'No help available yet';
+end
+
+if isa(msg, 'cell')
+    msg = strjoin(msg, ' ');
+end
+
+msg = sprintf(msg);
+
+
+end
+
diff --git a/+ndi/+dataset/+gui/resources/html/emblem_pulse.html b/+ndi/+dataset/+gui/resources/html/emblem_pulse.html
new file mode 100644
index 000000000..8d9fa537b
--- /dev/null
+++ b/+ndi/+dataset/+gui/resources/html/emblem_pulse.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>SVG Pulse Animation</title>
+    <style>
+        @keyframes pulse {
+            to {
+                transform: scale(0.6);
+                opacity: 0.5;
+            }
+        }
+        #path1, #path2 {
+            transform-origin: center;
+        }
+
+
+        #path1 {
+            animation: pulse 0.5s alternate infinite ease-in-out;
+        }
+
+        #path2 {
+            animation: pulse 0.5s 0.5s alternate infinite ease-in-out;
+        }
+
+        .cls-1 {
+            fill: #002054;
+        }
+
+        .container {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            height: 100vh;
+            width: 100vw;
+            overflow: hidden;
+        }
+
+        svg {
+            overflow: visible;
+            width: 50px;
+            height: 50px;
+        }
+    </style>
+</head>
+<body>
+    <div class="container">
+        <svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 432.55 447.84" width="200" height="200">
+            <g id="Layer_1-2" data-name="Layer 1">
+                <g>
+                    <path id="path1" class="cls-1" d="m72,180.25l42.9,29.24,84.13-56.63V0L35.16,110.2C13.16,125.03,0,149.75,0,176.32c0,17.38,5.67,34.05,15.79,47.61-10.12,13.55-15.79,30.21-15.79,47.61,0,26.55,13.16,51.27,35.16,66.1l163.87,110.2v-152.87l-58.93-39.7-46.56-31.34-17.86-12.05-7.17-4.79-6.94-4.71c-3.51-2.38-6.46-5.42-8.7-8.85-3.26-5.02-5.02-10.92-5.02-17.22,0-10.77,5.1-20.42,14.04-26.4l47.38-31.82,41.94-28.24v37.49l-79.2,52.9Zm79.2,177.72l-89.32-60.06c-8.93-5.98-14.04-15.63-14.04-26.38,0-6.32,1.76-12.22,5.02-17.24l98.34,66.18v37.49Z"/>
+                    <path id="path2" class="cls-1" d="m360.55,267.59l-42.9-29.24-84.13,56.63v152.87l163.87-110.2c22.01-14.83,35.16-39.56,35.16-66.12,0-17.38-5.67-34.05-15.79-47.61,10.12-13.55,15.79-30.21,15.79-47.61,0-26.55-13.16-51.27-35.16-66.1L233.52,0v152.87l58.93,39.7,46.56,31.34,17.86,12.05,7.17,4.79,6.94,4.71c3.51,2.38,6.46,5.42,8.68,8.85,3.28,5.02,5.04,10.92,5.04,17.22,0,10.77-5.1,20.42-14.04,26.4l-47.38,31.82-41.94,28.24v-37.49l79.2-52.9Zm-79.2-177.72l89.32,60.06c8.93,5.98,14.04,15.63,14.04,26.38,0,6.32-1.76,12.22-5.04,17.24l-98.32-66.18v-37.49Z"/>
+                </g>
+            </g>
+        </svg>
+    </div>
+</body>
+</html>
diff --git a/+ndi/+dataset/+gui/resources/preset/BIDS.json b/+ndi/+dataset/+gui/resources/preset/BIDS.json
new file mode 100644
index 000000000..3b3dc9cf0
--- /dev/null
+++ b/+ndi/+dataset/+gui/resources/preset/BIDS.json
@@ -0,0 +1,26 @@
+{
+  "ClassName": "ndi.dataset.gui.models.FolderOrganizationModel",
+  "Description": "NDI Folder Organization Model",
+  "Version": "1.0.0",
+  "DateCreated": "16-May-2024",
+  "DateModified": "16-May-2024",
+  "Properties": {
+    "FolderLevels": [
+      {
+        "Name": "",
+        "Type": "Subject",
+        "Expression": "sub*",
+        "IgnoreList": [],
+        "FolderNamePrefix": ""
+      },
+      {
+        "Name": "",
+        "Type": "Session",
+        "Expression": "ses*",
+        "IgnoreList": [],
+        "FolderNamePrefix": ""
+      }
+    ],
+    "SubFolders": []
+  }
+}
\ No newline at end of file
diff --git a/+ndi/+dataset/+gui/resources/preset/vhlab.json b/+ndi/+dataset/+gui/resources/preset/vhlab.json
new file mode 100644
index 000000000..bbbcc1c5a
--- /dev/null
+++ b/+ndi/+dataset/+gui/resources/preset/vhlab.json
@@ -0,0 +1,26 @@
+{
+  "ClassName": "ndi.dataset.gui.models.FolderOrganizationModel",
+  "Description": "NDI Folder Organization Model",
+  "Version": "1.0.0",
+  "DateCreated": "16-May-2024",
+  "DateModified": "16-May-2024",
+  "Properties": {
+    "FolderLevels": [
+      {
+        "Name": "2023-05-31",
+        "Type": "Session",
+        "Expression": "",
+        "IgnoreList": [],
+        "FolderNamePrefix": ""
+      },
+      {
+        "Name": "t00001",
+        "Type": "Epoch",
+        "Expression": "t",
+        "IgnoreList": [],
+        "FolderNamePrefix": ""
+      }
+    ],
+    "SubFolders": []
+  }
+}
\ No newline at end of file
diff --git a/+ndi/+file/+internal/FileParameterSpecification.m b/+ndi/+file/+internal/FileParameterSpecification.m
new file mode 100644
index 000000000..817617bcb
--- /dev/null
+++ b/+ndi/+file/+internal/FileParameterSpecification.m
@@ -0,0 +1,42 @@
+classdef FileParameterSpecification
+%FileParameterSpecification Specification for a DAQ System file parameter
+%
+%   This specification is used by the DAQ System Configurator for
+%   interactively picking and adding file parameters to a DAQ system
+%   configuration template
+    
+    properties
+        % OriginalFilename - The original filename used to select a file parameter.
+        %   This is the exact filename of a file belonging to a specific
+        %   session and epoch.
+        OriginalFilename (1,1) string = missing
+        
+        % ClassType - The type of class to use for reading file
+        %   This should be one of "DAQ Reader", "Metadata Reader" or "Epoch Probe Map"
+        ClassType (1,1) string {mustBeMember(ClassType, ["DAQ Reader", "Metadata Reader", "Epoch Probe Map"])} = "DAQ Reader"
+        
+        % ClassName - The full name of the matlab class to use for reading file
+        ClassName (1,1) string = missing
+
+        % UseRegularExpression - Whether to use a regular expression to find file
+        %   If this is true, a regular expression is used to find the file,
+        %   otherwise the full name in OriginalFilename is used.
+        UseRegularExpression (1,1) logical = false
+
+        % RegularExpression - A regular expression for finding file.
+        %   This should be non-missing if UseRegularExpression is true
+        RegularExpression (1,1) string = missing
+    end
+    
+    methods
+        function obj = FileParameterSpecification(propertyValues)
+            arguments
+                propertyValues.?ndi.file.internal.FileParameterSpecification
+            end
+
+            for fieldName = string(fieldnames(propertyValues)')
+                obj.(fieldName) = propertyValues.(fieldName);
+            end
+        end
+    end
+end
diff --git a/+ndi/+file/tempsave.m b/+ndi/+file/tempsave.m
new file mode 100644
index 000000000..9ed92e42f
--- /dev/null
+++ b/+ndi/+file/tempsave.m
@@ -0,0 +1,19 @@
+function [filePath, cleanupObj] = tempsave(fileUrl, fileName)
+% tempsave - Save file from the web to temporary location
+%
+%   File is automatically deleted when the cleanupObj is deleted or cleared
+%   from the workspace
+
+    if nargin < 2
+        [~, fileName, fileExtension] = fileparts( char(fileUrl) );
+    end
+
+    filePath = websave(fullfile(tempdir, [fileName, fileExtension] ), fileUrl );
+    cleanupObj = onCleanup(@(filename) deleteTempFile(filePath));
+end
+
+function deleteTempFile(filePath)
+    if isfile(filePath)
+        delete(filePath)
+    end
+end
diff --git a/+ndi/+gui/+control/resources/icons/help.png b/+ndi/+gui/+control/resources/icons/help.png
new file mode 100644
index 000000000..51b562fb0
Binary files /dev/null and b/+ndi/+gui/+control/resources/icons/help.png differ
diff --git a/+ndi/+gui/+control/resources/icons/minus.png b/+ndi/+gui/+control/resources/icons/minus.png
new file mode 100644
index 000000000..07d588615
Binary files /dev/null and b/+ndi/+gui/+control/resources/icons/minus.png differ
diff --git a/+ndi/+gui/+control/resources/icons/plus.png b/+ndi/+gui/+control/resources/icons/plus.png
new file mode 100644
index 000000000..5f4ddce54
Binary files /dev/null and b/+ndi/+gui/+control/resources/icons/plus.png differ
diff --git a/+ndi/+gui/+control/resources/label_background.png b/+ndi/+gui/+control/resources/label_background.png
new file mode 100644
index 000000000..55342216f
Binary files /dev/null and b/+ndi/+gui/+control/resources/label_background.png differ
diff --git a/+ndi/+gui/+internal/+theme/NDIButtonLight.m b/+ndi/+gui/+internal/+theme/NDIButtonLight.m
new file mode 100644
index 000000000..772403da4
--- /dev/null
+++ b/+ndi/+gui/+internal/+theme/NDIButtonLight.m
@@ -0,0 +1,30 @@
+classdef NDIButtonLight < uim.style.buttonScheme
+    
+    properties (Constant)
+        
+        HighlightedOn = struct(...
+            'ForegroundColor', ones(1,3) * 0.9, ...
+            'BackgroundColor', ones(1,3) * 0.4, ...
+            'BackgroundAlpha', 0.4, ...
+            'BorderColor', 'k', ...
+            'BorderWidth', 0.5 )
+        HighlightedOff = struct(...
+            'ForegroundColor', hex2rgb('#002054'), ...
+            'BackgroundColor', ndi.dataset.gui.WizardTheme.FigureBgColor, ...
+            'BackgroundAlpha', 1, ...
+            'BorderColor', 'k', ...
+            'BorderWidth', 0.5 )
+        On = struct(...
+            'ForegroundColor', ones(1,3) * 0.9, ...
+            'BackgroundColor', ones(1,3) * 0.4, ...
+            'BackgroundAlpha', 0.4, ...
+            'BorderColor', 'k', ...
+            'BorderWidth', 0.5 )
+        Off = struct(...
+            'ForegroundColor', hex2rgb('#002054'), ...
+            'BackgroundColor', ndi.dataset.gui.WizardTheme.FigureBgColor, ...
+            'BackgroundAlpha', 0.8, ...
+            'BorderColor', 'k', ...
+            'BorderWidth', 0.5 )
+    end
+end
diff --git a/+ndi/+gui/+internal/+theme/NDITheme.m b/+ndi/+gui/+internal/+theme/NDITheme.m
new file mode 100644
index 000000000..ac54c6e6b
--- /dev/null
+++ b/+ndi/+gui/+internal/+theme/NDITheme.m
@@ -0,0 +1,20 @@
+classdef NDITheme < handle
+
+    % Questions:
+    % Should there be static methods to retrieve colors in different
+    % formats? Or should it always be matlab centric, i.e 1x3 in [0,1]
+
+    % Todo:
+    %   [ ] Define different theme superclasses. I.e this is a 2+3 brand 
+    %       theme. Or define primary and secondary colors as vectors?
+    %   [ ] Add accent colors?
+
+    properties (Constant)
+        PrimaryColorA = hex2rgb( '#002054' )
+        PrimaryColorB = hex2rgb( '#17A7FF' )
+        PrimaryColorC = hex2rgb( '#F6F8FC' ) % Light.
+        SecondaryColorA = hex2rgb( '#2EB0FF' )
+        SecondaryColorB = hex2rgb( '#5DC1FF' )
+        SecondaryColorC = hex2rgb( '#FDF7FA' ) % Light.
+    end
+end
diff --git a/+ndi/+gui/+utility/+internal/getIconPath.m b/+ndi/+gui/+utility/+internal/getIconPath.m
new file mode 100644
index 000000000..5bd72ba0a
--- /dev/null
+++ b/+ndi/+gui/+utility/+internal/getIconPath.m
@@ -0,0 +1,16 @@
+function iconFilePath = getIconPath(name)
+%getLogoPath - Get filepath for an icon resource
+    arguments
+        name (1,1) string 
+    end
+    % Todo: use ndi.util.toolboxdir
+    rootPath = fileparts(fileparts(fileparts(mfilename('fullpath'))));
+    iconFolderPath = fullfile(rootPath, 'resources', 'icons');
+    L = dir(fullfile(iconFolderPath, sprintf('%s.*', name)));
+    if isempty(L)
+        error('No icon with name "%s" was found', name)
+    end
+
+    %fileName = sprintf('%s.png', name);
+    iconFilePath = fullfile(iconFolderPath, L.name);
+end
\ No newline at end of file
diff --git a/+ndi/+gui/+utility/+internal/getLogoPath.m b/+ndi/+gui/+utility/+internal/getLogoPath.m
new file mode 100644
index 000000000..7e309fcdf
--- /dev/null
+++ b/+ndi/+gui/+utility/+internal/getLogoPath.m
@@ -0,0 +1,12 @@
+function logoFilePath = getLogoPath(name, mode)
+%getLogoPath - Get filepath for a logo resource
+    arguments
+        name (1,1) string {mustBeMember(name, ["ndi_cloud"])} = "ndi_cloud"
+        mode (1,1) string {mustBeMember(mode, ["light", "dark"])} = "light"
+    end
+    % Todo: use ndi.util.toolboxdir
+    rootPath = fileparts(fileparts(fileparts(mfilename('fullpath'))));
+    logoFolderPath = fullfile(rootPath, 'resources', 'images');
+    fileName = sprintf('%s_logo_%s.png', name, mode);
+    logoFilePath = fullfile(logoFolderPath, fileName);
+end
\ No newline at end of file
diff --git a/+ndi/+gui/+utility/centerFigureOnScreen.m b/+ndi/+gui/+utility/centerFigureOnScreen.m
new file mode 100644
index 000000000..0c529e755
--- /dev/null
+++ b/+ndi/+gui/+utility/centerFigureOnScreen.m
@@ -0,0 +1,14 @@
+function centerFigureOnScreen(hFig)
+%centerFigureOnScreen Center figure on the monitor it is located
+
+    screenSize = ndi.gui.utility.getCurrentScreenSize(hFig);
+    
+    figPos = getpixelposition(hFig);
+    figSize = figPos(3:4);
+    
+    margins = (screenSize(3:4) - figSize) ./ 2;
+    figLocation = margins + screenSize(1:2);
+            
+    % Create the figure window
+    setpixelposition(hFig, [figLocation figSize])
+end
diff --git a/+ndi/+gui/+utility/getCurrentScreenSize.m b/+ndi/+gui/+utility/getCurrentScreenSize.m
new file mode 100644
index 000000000..ddfb1bbfa
--- /dev/null
+++ b/+ndi/+gui/+utility/getCurrentScreenSize.m
@@ -0,0 +1,72 @@
+function [screenSize, screenNumber] = getCurrentScreenSize(hFig)
+%GETCURRENTSCREENSIZE Summary of this function goes here
+%
+%   [screenSize, screenNumber] = getCurrentScreenSize(hFig) returns the
+%   posision coordinates (screenSize) and number of the monitor where a 
+%   figure is located.
+    
+    MP = get(0, 'MonitorPosition');
+    if size(MP, 1) == 1
+        screenSize = MP;
+        screenNumber = 1;
+        return
+    end
+    
+    % Get coordinates for upper left corner of figure
+    xPos = hFig.Position(1);
+    yPos = hFig.Position(2) + hFig.Position(4);
+    
+    screenNumber = getMonitorIdx([xPos, yPos], MP); % Check upper left 
+
+    if isnan(screenNumber)                          % Check upper right 
+        % Get x-coordinate for upper right corner
+        xPos = hFig.Position(1) + hFig.Position(3);
+        screenNumber = getMonitorIdx([xPos, yPos], MP);
+    end
+    
+    if ~isnan(screenNumber)
+        screenSize = MP(screenNumber, :);
+    else
+        screenSize = get(0, 'ScreenSize');
+        screenNumber = 1;
+        warning('Could not resolve which screen figure is on, using main screen...')
+        %screenSize = [];
+    end
+
+    if nargout == 1
+        clear screenNumber
+    end
+end
+
+function monitorIdx = getMonitorIdx(point, monitorPositionArray)
+%getMonitorIdx Find index of the monitor where point is located.
+%
+%   monitorIdx = getMonitorIdx(point, monitorPositionArray) returns the
+%   index for the monitor where the given point is located. point is a
+%   1x2 vector with x- and y-coordinate and monitorPositionArra is an
+%   nMonitor x 4 matrix of monitorPositions for each monitor.
+
+    monitorIdx = nan;
+    numMonitors = size(monitorPositionArray, 1);
+    
+    % Find monitor where point is located
+    for iMonitor = 1:numMonitors
+         if isPointInPosition( point, monitorPositionArray(iMonitor, :) )
+            monitorIdx = iMonitor;
+            break
+        end
+    end
+    
+end
+
+function tf = isPointInPosition(point, position)
+%isPointInPosition Check if point is inside limits of position
+    tf = false;
+
+    if point(1) >= position(1) && point(1) <= sum( position([1,3]) - 1 )
+        if point(2) >= position(2) && point(2) <= sum( position([2,4]) - 1 )
+            tf = true;
+        end
+    end
+
+end
diff --git a/+ndi/+gui/+window/+wizard/+abstract/Page.m b/+ndi/+gui/+window/+wizard/+abstract/Page.m
new file mode 100644
index 000000000..a3a28c062
--- /dev/null
+++ b/+ndi/+gui/+window/+wizard/+abstract/Page.m
@@ -0,0 +1,120 @@
+classdef Page < handle & matlab.mixin.Heterogeneous
+
+    % Todo
+    % [ ] Layout keyword / token. Preconfigure some layouts that can fit in the
+    %     wizards grid layout. 
+    %  - [ ] On construction: Set up components in layout
+    %  - [ ] On switching pages: Hide/show components...
+
+    % [ ] GetPageData / SetPageData
+   
+
+    properties (Abstract, Constant)
+        Name
+        Title
+        Description
+    end
+
+    properties (Access = {?ndi.gui.window.wizard.WizardApp, ?ndi.gui.window.wizard.abstract.Page})
+        ShowNavigationButtons = true
+        DoCreatePanel = true
+        IsInitialized = false
+    end
+
+    properties (Access = protected)
+        ParentApp
+        UIPanel
+    end
+
+    properties
+        Visible (1,1) matlab.lang.OnOffSwitchState = "on"
+    end
+    
+    methods
+        function obj = Page()
+        end
+    end
+
+    methods (Access = {?ndi.gui.window.wizard.WizardApp, ?ndi.gui.window.wizard.abstract.Page})
+        function initialize(obj, parentApp)
+            obj.ParentApp = parentApp;
+
+            %pause(1)
+            if obj.DoCreatePanel
+                obj.createPanel()
+            end
+            obj.createComponents()
+
+            obj.IsInitialized = true;
+        end
+    end
+
+    methods (Access = ?ndi.gui.window.wizard.WizardApp)
+        function enterPage(obj)
+            obj.show()
+            obj.onPageEntered()
+        end
+
+        function leavePage(obj)
+            obj.hide()
+            obj.onPageExited()
+        end
+
+        function show(obj)
+            obj.Visible = 'on';
+        end
+
+        function hide(obj)
+            obj.Visible = 'off';
+        end
+    end
+
+    methods (Access = protected)
+        
+        function onVisiblePropertyValueSet(obj)
+            if ~isempty(obj.UIPanel)
+                obj.UIPanel.Visible = obj.Visible;
+            end
+        end
+
+        function onPageEntered(obj)
+            % Subclasses may override
+        end
+
+        function onPageExited(obj)
+            % Subclasses may override
+        end
+
+        function createComponents(obj)
+            % descriptionLabel = uilabel( obj.UIPanel );
+            % descriptionLabel.Position = [50,30,200,25];
+            % descriptionLabel.HorizontalAlignment = 'center';
+            % descriptionLabel.VerticalAlignment = 'top';
+            % descriptionLabel.FontSize = 16;
+            % descriptionLabel.Text = 'Lorem Ipsum';
+        end
+    end
+
+    methods (Access = private)
+        function createPanel(obj)
+            obj.UIPanel = uipanel( ...
+                obj.ParentApp.BodyGridLayout, ...
+                'Visible', 'off', ...
+                'BackgroundColor', 'w', ...
+                'BorderColor', obj.ParentApp.Theme.HeaderBgColor, ...
+                'BorderWidth', 1);
+            obj.UIPanel.Tag = sprintf(obj.Title);
+
+            obj.UIPanel.Layout.Row = 3;
+            obj.UIPanel.Layout.Column = 1;
+        end
+    end
+
+    methods 
+        function set.Visible(obj, newValue)
+            obj.Visible = newValue;
+            obj.onVisiblePropertyValueSet()
+        end
+    end
+
+end
\ No newline at end of file
diff --git a/+ndi/+gui/+window/+wizard/+abstract/Theme.m b/+ndi/+gui/+window/+wizard/+abstract/Theme.m
new file mode 100644
index 000000000..e3f4bb168
--- /dev/null
+++ b/+ndi/+gui/+window/+wizard/+abstract/Theme.m
@@ -0,0 +1,16 @@
+classdef Theme < handle
+
+    properties (Abstract, Constant)
+        FontName;
+    
+        HeaderBgColor
+        HeaderMidColor
+        HeaderFgColor
+        
+        FigureBgColor
+        FigureFgColor
+        
+        ControlPanelsBgColor
+    end
+end
+
diff --git a/+ndi/+gui/+window/+wizard/WizardApp.mlapp b/+ndi/+gui/+window/+wizard/WizardApp.mlapp
new file mode 100644
index 000000000..782326008
Binary files /dev/null and b/+ndi/+gui/+window/+wizard/WizardApp.mlapp differ
diff --git a/+ndi/+gui/+window/+wizard/resources/html/emblem_pulse.html b/+ndi/+gui/+window/+wizard/resources/html/emblem_pulse.html
new file mode 100644
index 000000000..8d9fa537b
--- /dev/null
+++ b/+ndi/+gui/+window/+wizard/resources/html/emblem_pulse.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>SVG Pulse Animation</title>
+    <style>
+        @keyframes pulse {
+            to {
+                transform: scale(0.6);
+                opacity: 0.5;
+            }
+        }
+        #path1, #path2 {
+            transform-origin: center;
+        }
+
+
+        #path1 {
+            animation: pulse 0.5s alternate infinite ease-in-out;
+        }
+
+        #path2 {
+            animation: pulse 0.5s 0.5s alternate infinite ease-in-out;
+        }
+
+        .cls-1 {
+            fill: #002054;
+        }
+
+        .container {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            height: 100vh;
+            width: 100vw;
+            overflow: hidden;
+        }
+
+        svg {
+            overflow: visible;
+            width: 50px;
+            height: 50px;
+        }
+    </style>
+</head>
+<body>
+    <div class="container">
+        <svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 432.55 447.84" width="200" height="200">
+            <g id="Layer_1-2" data-name="Layer 1">
+                <g>
+                    <path id="path1" class="cls-1" d="m72,180.25l42.9,29.24,84.13-56.63V0L35.16,110.2C13.16,125.03,0,149.75,0,176.32c0,17.38,5.67,34.05,15.79,47.61-10.12,13.55-15.79,30.21-15.79,47.61,0,26.55,13.16,51.27,35.16,66.1l163.87,110.2v-152.87l-58.93-39.7-46.56-31.34-17.86-12.05-7.17-4.79-6.94-4.71c-3.51-2.38-6.46-5.42-8.7-8.85-3.26-5.02-5.02-10.92-5.02-17.22,0-10.77,5.1-20.42,14.04-26.4l47.38-31.82,41.94-28.24v37.49l-79.2,52.9Zm79.2,177.72l-89.32-60.06c-8.93-5.98-14.04-15.63-14.04-26.38,0-6.32,1.76-12.22,5.02-17.24l98.34,66.18v37.49Z"/>
+                    <path id="path2" class="cls-1" d="m360.55,267.59l-42.9-29.24-84.13,56.63v152.87l163.87-110.2c22.01-14.83,35.16-39.56,35.16-66.12,0-17.38-5.67-34.05-15.79-47.61,10.12-13.55,15.79-30.21,15.79-47.61,0-26.55-13.16-51.27-35.16-66.1L233.52,0v152.87l58.93,39.7,46.56,31.34,17.86,12.05,7.17,4.79,6.94,4.71c3.51,2.38,6.46,5.42,8.68,8.85,3.28,5.02,5.04,10.92,5.04,17.22,0,10.77-5.1,20.42-14.04,26.4l-47.38,31.82-41.94,28.24v-37.49l79.2-52.9Zm-79.2-177.72l89.32,60.06c8.93,5.98,14.04,15.63,14.04,26.38,0,6.32-1.76,12.22-5.04,17.24l-98.32-66.18v-37.49Z"/>
+                </g>
+            </g>
+        </svg>
+    </div>
+</body>
+</html>
diff --git a/+ndi/+gui/resources/icons/confirm.png b/+ndi/+gui/resources/icons/confirm.png
new file mode 100644
index 000000000..054551c6c
Binary files /dev/null and b/+ndi/+gui/resources/icons/confirm.png differ
diff --git a/+ndi/+gui/resources/icons/edit.svg b/+ndi/+gui/resources/icons/edit.svg
new file mode 100644
index 000000000..d15db8c5c
--- /dev/null
+++ b/+ndi/+gui/resources/icons/edit.svg
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   class="svg-icon"
+   style="width: 1em;height: 1em;vertical-align: middle;fill: currentColor;overflow: hidden;"
+   viewBox="0 0 1024 1024"
+   version="1.1"
+   id="svg2"
+   sodipodi:docname="001_-edit copy.svg"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="namedview2"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="0.23046875"
+     inkscape:cx="512"
+     inkscape:cy="512"
+     inkscape:window-width="1312"
+     inkscape:window-height="449"
+     inkscape:window-x="0"
+     inkscape:window-y="38"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <path
+     d="m 851.65,891.87024 h -679.3 a 35.755,35.755 0 0 1 0,-71.51 h 679.3 a 35.755,35.755 0 0 1 0,71.51 z"
+     fill="#2eb0ff"
+     id="path1" />
+  <path
+     d="m 767.03,241.48024 -90.59,-90.59 a 64.06,64.06 0 0 0 -90.59,0 l -383.52,383.52 a 64.06,64.06 0 0 0 -17,30.46 l -28.31,118.9 c -9.84,41.32 22.16,78.95 62,78.95 a 65.17,65.17 0 0 0 15.11,-1.79 l 118.9,-28.31 a 64.06,64.06 0 0 0 30.46,-17 l 383.54,-383.55 a 64.06,64.06 0 0 0 0,-90.59 z m -441.65,405.83 -71.9,17.12 17.12,-71.9 267.16,-267.15 54.78,54.78 z m 330.36,-330.35 -54.8,-54.78 30.19,-30.19 54.81,54.79 z"
+     fill="#002054"
+     id="path2" />
+</svg>
diff --git a/+ndi/+gui/resources/icons/export.png b/+ndi/+gui/resources/icons/export.png
new file mode 100644
index 000000000..f1d9ac697
Binary files /dev/null and b/+ndi/+gui/resources/icons/export.png differ
diff --git a/+ndi/+gui/resources/icons/help.png b/+ndi/+gui/resources/icons/help.png
new file mode 100644
index 000000000..51b562fb0
Binary files /dev/null and b/+ndi/+gui/resources/icons/help.png differ
diff --git a/+ndi/+gui/resources/icons/import.png b/+ndi/+gui/resources/icons/import.png
new file mode 100644
index 000000000..5abb826cb
Binary files /dev/null and b/+ndi/+gui/resources/icons/import.png differ
diff --git a/+ndi/+gui/resources/icons/readme.md b/+ndi/+gui/resources/icons/readme.md
new file mode 100644
index 000000000..d2a186201
--- /dev/null
+++ b/+ndi/+gui/resources/icons/readme.md
@@ -0,0 +1,10 @@
+icons from https://www.veryicon.com/icons/miscellaneous/linear-bicolor-icon/:
+- edit
+- set-up
+- upload
+
+icons created in keynote:
+- confirm
+- export
+- import
+- help
\ No newline at end of file
diff --git a/+ndi/+gui/resources/icons/set-up.svg b/+ndi/+gui/resources/icons/set-up.svg
new file mode 100644
index 000000000..050871c1b
--- /dev/null
+++ b/+ndi/+gui/resources/icons/set-up.svg
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   class="svg-icon"
+   style="width: 1em;height: 1em;vertical-align: middle;fill: currentColor;overflow: hidden;"
+   viewBox="0 0 1024 1024"
+   version="1.1"
+   id="svg2"
+   sodipodi:docname="001_-set-up copy.svg"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="namedview2"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="0.23046875"
+     inkscape:cx="512"
+     inkscape:cy="512"
+     inkscape:window-width="1312"
+     inkscape:window-height="449"
+     inkscape:window-x="0"
+     inkscape:window-y="38"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <g
+     id="g2"
+     transform="translate(-28.415351,14.07)">
+    <path
+       d="M 924.43,424.54 H 851.29 A 315.87,315.87 0 0 0 812.08,330 l 51.7,-51.7 a 18.46,18.46 0 0 0 0,-26 l -77.66,-77.66 a 18.46,18.46 0 0 0 -26,0 l -51.7,51.7 a 317.65,317.65 0 0 0 -94.68,-39.21 v -73 A 18.48,18.48 0 0 0 595.32,95.71 H 485.59 a 18.48,18.48 0 0 0 -18.42,18.42 v 73.14 a 315.87,315.87 0 0 0 -94.58,39.21 l -51.7,-51.7 a 18.46,18.46 0 0 0 -26,0 l -77.63,77.62 a 18.46,18.46 0 0 0 0,26 l 51.7,51.7 a 315.87,315.87 0 0 0 -39.21,94.58 H 156.62 A 18.48,18.48 0 0 0 138.2,443.1 v 109.73 a 18.48,18.48 0 0 0 18.42,18.42 h 73 a 317.65,317.65 0 0 0 39.21,94.68 l -51.6,51.6 a 18.46,18.46 0 0 0 0,26 l 77.66,77.66 a 18.46,18.46 0 0 0 26,0 l 51.6,-51.7 a 317.34,317.34 0 0 0 94.79,39.32 v 72.92 a 18.48,18.48 0 0 0 18.42,18.42 h 109.76 a 18.48,18.48 0 0 0 18.42,-18.42 v -73 a 315.09,315.09 0 0 0 94.68,-39.32 l 51.6,51.6 a 18.46,18.46 0 0 0 26,0 l 77.66,-77.66 a 18.46,18.46 0 0 0 0,-26 l -51.7,-51.6 A 317.65,317.65 0 0 0 851.29,571 h 72.92 a 18.48,18.48 0 0 0 18.42,-18.42 V 443 a 18.3,18.3 0 0 0 -18.2,-18.46 z m -162.55,146.6 a 222.38,222.38 0 0 1 -13,31.45 235.21,235.21 0 0 1 -103.55,103.62 222.38,222.38 0 0 1 -31.45,13 232.46,232.46 0 0 1 -73.36,11.79 234.81,234.81 0 0 1 -73.25,-11.63 243.3,243.3 0 0 1 -31.56,-13 233.51,233.51 0 0 1 -116.76,-281.73 221.09,221.09 0 0 1 13,-31.35 233.9,233.9 0 0 1 43.52,-60.11 231.37,231.37 0 0 1 60.11,-43.52 234.74,234.74 0 0 1 177.95,-13.14 222.38,222.38 0 0 1 31.45,13 231.79,231.79 0 0 1 60.11,43.63 235.23,235.23 0 0 1 43.52,60 222.38,222.38 0 0 1 13,31.45 232.46,232.46 0 0 1 11.8,73.4 225.5,225.5 0 0 1 -11.53,73.14 z"
+       fill="#002054"
+       id="path1" />
+    <path
+       d="m 540.52,357.86 c -77.23,0 -140,62.8 -140,140 0,77.2 62.8,140 140,140 77.2,0 140,-62.8 140,-140 0,-77.2 -62.76,-140 -140,-140 z m 0,193.89 a 53.86,53.86 0 1 1 53.86,-53.86 53.88,53.88 0 0 1 -53.86,53.86 z"
+       fill="#2eb0ff"
+       id="path2" />
+  </g>
+</svg>
diff --git a/+ndi/+gui/resources/icons/upload.svg b/+ndi/+gui/resources/icons/upload.svg
new file mode 100644
index 000000000..0afd64d1d
--- /dev/null
+++ b/+ndi/+gui/resources/icons/upload.svg
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   class="svg-icon"
+   style="width: 1em;height: 1em;vertical-align: middle;fill: currentColor;overflow: hidden;"
+   viewBox="0 0 1024 1024"
+   version="1.1"
+   id="svg3"
+   sodipodi:docname="001_-upload copy.svg"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs3" />
+  <sodipodi:namedview
+     id="namedview3"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="0.23046875"
+     inkscape:cx="512"
+     inkscape:cy="512"
+     inkscape:window-width="1312"
+     inkscape:window-height="449"
+     inkscape:window-x="0"
+     inkscape:window-y="38"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3" />
+  <path
+     d="m 781.65,371.80669 -195.08,-195.06 a 105.46,105.46 0 0 0 -149.18,0 l -195,195.06 a 36.493781,36.493781 0 0 0 51.61,51.61 l 181.51,-181.55 v 417.87999 a 36.5,36.5 0 1 0 73,0 V 241.85669 l 181.53,181.55 a 36.493781,36.493781 0 0 0 51.61,-51.61 z"
+     fill="#2eb0ff"
+     id="path2" />
+  <path
+     d="M 831.32,878.65668 H 192.68 a 100.47,100.47 0 0 1 -100.35,-100.35 v -182.47 a 45.62,45.62 0 0 1 91.23,0 v 182.47001 a 9.13,9.13 0 0 0 9.12,9.12 h 638.64 a 9.13,9.13 0 0 0 9.12,-9.12 V 595.83668 a 45.62,45.62 0 0 1 91.23,0 v 182.47 a 100.47,100.47 0 0 1 -100.35,100.35 z"
+     fill="#002054"
+     id="path1" />
+  <path
+     d="m 512,696.69668 a 37,37 0 0 1 -37,-37 v -416.63 L 294.31,423.74669 A 37,37 0 1 1 241.99,371.44668 L 437.07,176.36669 a 106,106 0 0 1 149.86,0 L 782,371.44668 a 37,37 0 1 1 -52.31,52.30001 L 548.99,243.06668 v 416.68 a 37,37 0 0 1 -36.99,36.95 z M 476,240.69669 v 419.04999 a 36,36 0 1 0 72,0 V 240.74669 l 182.39,182.31 a 36,36 0 1 0 50.9,-50.9 L 586.22,177.07668 a 105,105 0 0 0 -148.44,0 L 242.7,372.15669 a 36,36 0 0 0 50.9,50.9 z"
+     fill="#2eb0ff"
+     id="path3" />
+</svg>
diff --git a/+ndi/+gui/resources/images/ndi_cloud_logo_dark.png b/+ndi/+gui/resources/images/ndi_cloud_logo_dark.png
new file mode 100644
index 000000000..6d5e848e2
Binary files /dev/null and b/+ndi/+gui/resources/images/ndi_cloud_logo_dark.png differ
diff --git a/+ndi/+gui/resources/images/ndi_cloud_logo_light.png b/+ndi/+gui/resources/images/ndi_cloud_logo_light.png
new file mode 100644
index 000000000..8e09b5786
Binary files /dev/null and b/+ndi/+gui/resources/images/ndi_cloud_logo_light.png differ
diff --git a/+ndi/+internal/+mixin/JsonSerializable.m b/+ndi/+internal/+mixin/JsonSerializable.m
new file mode 100644
index 000000000..5d0eebf16
--- /dev/null
+++ b/+ndi/+internal/+mixin/JsonSerializable.m
@@ -0,0 +1,175 @@
+classdef JsonSerializable < handle
+% JsonSerializable - A mixin class for serializing class instances to json
+
+    % Todo: Don't serialize transient properties
+
+    properties (Abstract, Constant)
+        VERSION (1,1) string
+        DESCRIPTION (1,1) string
+    end
+
+    properties (Access = private)
+        DateCreated (1,1) string = missing
+    end
+    
+    methods (Sealed)
+        function jsonStr = toJson(obj, filePath)
+            arguments
+                obj (1,1) ndi.internal.mixin.JsonSerializable
+                filePath (1,1) string = missing
+            end
+            
+            % Create a struct with the required header fields
+            jsonStruct = obj.createJsonHeader();
+            
+            % Check if the object is an array
+            if numel(obj) > 1
+                % Initialize an array of structs for each object
+                objArray = arrayfun(@(o) o.toStruct(), obj, 'UniformOutput', false);
+                jsonStruct.Properties = [objArray{:}];
+            else
+                % Convert single object to struct
+                jsonStruct.Properties = obj.toStruct();
+            end
+            
+            % Convert struct to JSON string
+            jsonStr = jsonencode(jsonStruct, 'PrettyPrint', true);
+
+            if ~ismissing(filePath)
+                fid = fopen(filePath, 'w');
+                fwrite(fid, jsonStr);
+                fclose(fid);
+            end
+            if ~nargout
+                clear jsonStr
+            end
+        end
+    
+        function tf = isClean(obj, filePath)
+        % isDirty - Compare current object with serialized json
+            if isfile(filePath)
+                jsonStrA = jsonencode( obj.toStruct() );
+    
+                deserializedObject = jsondecode(fileread(filePath));
+                jsonStrB = jsonencode(deserializedObject.Properties);
+    
+                tf = strcmp(jsonStrA, jsonStrB);
+            else
+                tf = ~obj.isInitialized();
+            end
+        end
+    end
+
+    methods (Access = private)
+        function jsonStruct = createJsonHeader(obj)           
+        % createStructWithHeader - Create a struct with required header fields
+            jsonStruct = struct();
+            jsonStruct.ClassName = class(obj);
+            jsonStruct.Description = obj.DESCRIPTION;
+            jsonStruct.Version = obj.VERSION;
+            if ismissing(obj.DateCreated)
+                [obj(:).DateCreated] = deal( string( datetime("today") ) );
+            end
+            jsonStruct.DateCreated = obj(1).DateCreated;
+            jsonStruct.DateModified = string( datetime("today") );
+        end
+    end
+    
+    methods (Access = protected)
+        
+        function tf = isInitialized(obj)
+        % isInitialized - Is data initialized?
+        %
+        % Subclasses can override. Is used in isClean. If no file exists
+        % isClean depends on isInitialized.
+            tf = true;
+        end
+
+        function s = toStruct(obj)
+            % Convert object properties to a struct
+
+            % Todo: Serialize objects...
+            metaObj = metaclass(obj);
+            s = struct();
+            for i = 1:numel(metaObj.PropertyList)
+                propName = metaObj.PropertyList(i).Name;
+                if ~metaObj.PropertyList(i).Constant && ~metaObj.PropertyList(i).Transient
+                    s.(propName) = obj.(propName);
+                end
+            end
+        end
+
+        function fromStruct(obj, s)
+        % Populate object properties from a struct
+
+            numInstances = numel(s);
+            
+            if numInstances > 1
+                obj(numInstances) = feval( class(obj) );
+                [obj(:).DateCreated] = deal(obj(1).DateCreated);
+            end
+
+            propertyNames = string( fieldnames(s)' );
+            for iInstance = 1:numInstances
+                for jPropertyName = propertyNames
+                    jPropertyValue = s(iInstance).(jPropertyName);
+                    
+                    if isa(jPropertyValue, 'struct')
+                        % Create object if property has a type
+                        if isobject( obj(iInstance).(jPropertyName) )
+                            propertyType = class( obj(iInstance).(jPropertyName) );
+                            jPropertyValue = obj.deserializeObjectArray(jPropertyValue, propertyType);
+                        end
+                    end
+
+                    try
+                        obj(iInstance).(jPropertyName) = jPropertyValue;
+                    catch ME
+                        rethrow(ME)
+                    end
+                end 
+            end
+        end
+    end
+
+    methods (Access = private)
+        function objectArray = deserializeObjectArray(~, structArray, className)
+            numObjects = numel(structArray);
+            objectArray = cell(1, numObjects);
+            
+            for i = 1:numObjects
+                nvPairs = namedargs2cell(structArray(i));
+                objectArray{i} = feval(className, nvPairs{:});
+            end
+            objectArray = [objectArray{:}];
+        end
+
+        function isTransient(obj, propertyName)
+
+
+        end
+    end
+
+    methods (Static)
+        function newObject = fromJson(jsonStr, className)
+        % fromJson - Populate class properties from json string
+            
+            if isfile(jsonStr)
+                jsonStr = fileread(jsonStr);
+            end
+
+            S = jsondecode(jsonStr);
+            
+            assert(strcmp(S.ClassName, className), ...
+                'JSON must be of type %s', className)
+            
+            if S.Version ~= eval([className, '.VERSION'])
+                % Pass
+            end
+
+            newObject = feval(className);
+            newObject.DateCreated = S.DateCreated;
+            newObject.fromStruct(S.Properties)
+        end
+    end
+end
diff --git a/+ndi/+internal/+setup/installFexPackage.m b/+ndi/+internal/+setup/installFexPackage.m
new file mode 100644
index 000000000..f2ace0da7
--- /dev/null
+++ b/+ndi/+internal/+setup/installFexPackage.m
@@ -0,0 +1,42 @@
+function installFexPackage(toolboxIdentifier, installLocation)
+    %toolboxIdentifier = "78895307-cc36-4970-8b66-0697da8f9352";
+    
+    % Check if toolbox is installed
+    addonsTable = matlab.addons.installedAddons();
+
+    isMatch = addonsTable.Identifier == toolboxIdentifier;
+
+    if any(isMatch)
+        if sum(isMatch) == 1
+            toolboxVersion = addonsTable.Version(isMatch);
+        elseif sum(isMatch) > 1
+            idx = find(isMatch, 1, 'first');
+            toolboxVersion = addonsTable.Version(idx);
+            warning('Selected version %s', toolboxVersion)
+        end
+        toolboxFolder = matlab.internal.addons.util.retrieveInstallationFolderForAddOn(toolboxIdentifier, toolboxVersion);
+        addpath(genpath(toolboxFolder));
+    else
+        fprintf('Please wait, installing widgets toolbox... ')
+        fex = matlab.addons.repositories.FileExchangeRepository();
+        addonUrl = fex.getAddonURL(toolboxIdentifier);
+        
+        if endsWith(addonUrl, '.xml')
+            [filepath, C] = ndi.util.tempsave(addonUrl);
+            S = readstruct(filepath); delete(C)
+            addonUrl = S.downloadUrl;
+            addonUrl = extractBefore(addonUrl, '?');
+        end
+
+        if endsWith(addonUrl, '/zip')
+            [tempFilepath, C] = ndi.util.tempsave(addonUrl, [toolboxIdentifier, '_temp.zip']);
+            unzip(tempFilepath, installLocation); delete(C)
+
+        elseif endsWith(addonUrl, '/mltbx')
+            tempFile = websave(fullfile(tempdir,'temp.mltbx'), addonUrl );
+            matlab.addons.install(tempFile);
+            delete(tempFile)
+        end
+        fprintf('Done\n')
+    end
+    
\ No newline at end of file
diff --git a/+ndi/+internal/+setup/installWidgetsToolbox.m b/+ndi/+internal/+setup/installWidgetsToolbox.m
new file mode 100644
index 000000000..b344d318e
--- /dev/null
+++ b/+ndi/+internal/+setup/installWidgetsToolbox.m
@@ -0,0 +1,29 @@
+function installWidgetsToolbox()
+    toolboxIdentifier = "78895307-cc36-4970-8b66-0697da8f9352";
+
+    % Check if toolbox is installed
+    addonsTable = matlab.addons.installedAddons();
+
+    isMatch = addonsTable.Identifier == toolboxIdentifier;
+
+    if any(isMatch)
+        if sum(isMatch) == 1
+            toolboxVersion = addonsTable.Version(isMatch);
+        elseif sum(isMatch) > 1
+            idx = find(isMatch, 1, 'first');
+            toolboxVersion = addonsTable.Version(idx);
+            warning('Selected version %s', toolboxVersion)
+        end
+        toolboxFolder = matlab.internal.addons.util.retrieveInstallationFolderForAddOn(toolboxIdentifier, toolboxVersion);
+        addpath(genpath(toolboxFolder));
+    else
+        fprintf('Please wait, installing widgets toolbox... ')
+        fex = matlab.addons.repositories.FileExchangeRepository();
+        addonUrl = fex.getAddonURL(toolboxIdentifier);
+
+        tempFile = websave(fullfile(tempdir,'temp.mltbx'), addonUrl );
+        matlab.addons.install(tempFile);
+        delete(tempFile)
+        fprintf('Done\n')
+    end
+    
\ No newline at end of file
diff --git a/+ndi/+internal/tempsave.m b/+ndi/+internal/tempsave.m
new file mode 100644
index 000000000..9ed92e42f
--- /dev/null
+++ b/+ndi/+internal/tempsave.m
@@ -0,0 +1,19 @@
+function [filePath, cleanupObj] = tempsave(fileUrl, fileName)
+% tempsave - Save file from the web to temporary location
+%
+%   File is automatically deleted when the cleanupObj is deleted or cleared
+%   from the workspace
+
+    if nargin < 2
+        [~, fileName, fileExtension] = fileparts( char(fileUrl) );
+    end
+
+    filePath = websave(fullfile(tempdir, [fileName, fileExtension] ), fileUrl );
+    cleanupObj = onCleanup(@(filename) deleteTempFile(filePath));
+end
+
+function deleteTempFile(filePath)
+    if isfile(filePath)
+        delete(filePath)
+    end
+end
diff --git a/+ndi/+setup/+daq/+system/listDaqSystemNames.m b/+ndi/+setup/+daq/+system/listDaqSystemNames.m
index 813dbf789..19bba51d6 100644
--- a/+ndi/+setup/+daq/+system/listDaqSystemNames.m
+++ b/+ndi/+setup/+daq/+system/listDaqSystemNames.m
@@ -1,17 +1,27 @@
-function daqSystemNames = listDaqSystemNames(labName)
-    % listDaqSystemNames - List names of pre-configured DAQ systems for a lab
+function [daqSystemNames, daqSystemConfigFiles] = listDaqSystemNames(labName)
+% listDaqSystemNames - List names of pre-configured DAQ systems for a lab
+    
+    arguments
+        labName (1,1) string = missing
+    end
 
-    importDir = fullfile(ndi.common.PathConstants.CommonFolder, 'daq_systems', labName);
+    rootPath = fullfile(ndi.common.PathConstants.CommonFolder, 'daq_systems');
 
-    if ~isfolder(importDir)
-        error('No DAQ systems were found for "%s"', labName);
+    if ~ismissing(labName)
+        importDir = fullfile(rootPath, labName);
+    
+        if ~isfolder(importDir)
+            error('No DAQ systems were found for "%s"', labName)
+        end
+        L = dir(fullfile(importDir, '*.json'));
+    else
+        L = recursiveDir(rootPath, 'FileType', 'json');
     end
 
-    L = dir(fullfile(importDir, '*.json'));
 
     [~, daqSystemNames] = fileparts({L.name});
 
-    if ~isa(daqSystemNames,'cell'),
-        daqSystemNames = {daqSystemNames};
-    end;
+    if nargout == 2
+        daqSystemConfigFiles = arrayfun(@(s) fullfile(s.folder, s.name), L, 'uni', 0);
+    end
 end
diff --git a/+ndi/+setup/+daq/listDaqEpochProbemapClass.m b/+ndi/+setup/+daq/listDaqEpochProbemapClass.m
new file mode 100644
index 000000000..ad1d4f5b1
--- /dev/null
+++ b/+ndi/+setup/+daq/listDaqEpochProbemapClass.m
@@ -0,0 +1,3 @@
+function names = listDaqEpochProbemapClass()
+    names = {'epochprobemap_daqsystem'};
+end
\ No newline at end of file
diff --git a/+ndi/+setup/+daq/listDaqMetadataReaders.m b/+ndi/+setup/+daq/listDaqMetadataReaders.m
new file mode 100644
index 000000000..83c6d5c64
--- /dev/null
+++ b/+ndi/+setup/+daq/listDaqMetadataReaders.m
@@ -0,0 +1,22 @@
+function [names, absPaths] = listDaqMetadataReaders()
+    
+    % Collect paths of all root folders containing daq mdreaders in a cell array
+    rootPath = {};
+    rootPath{1} = ndi.util.getPackageDir('ndi.daq.metadatareader');
+    rootPath{2} = ndi.util.getPackageDir('ndi.setup.daq.metadatareader');
+    
+    % Find all m-files in these root folders.
+    fileExtension = '.m';
+    fileList = recursiveDir(rootPath, 'Type', 'file', 'FileType', fileExtension);
+    
+    % Add generic metadata reader:
+    pathStr = which('ndi.daq.metadatareader');
+    fileList = [dir(pathStr); fileList];
+
+    names = {fileList.name};
+    names = strrep(names, fileExtension, '');
+    
+    if nargout >= 2
+        absPaths = ndi.util.dir2abspath(fileList);
+    end
+end
diff --git a/+ndi/+setup/+daq/listDaqReaders.m b/+ndi/+setup/+daq/listDaqReaders.m
new file mode 100644
index 000000000..087d6bdf4
--- /dev/null
+++ b/+ndi/+setup/+daq/listDaqReaders.m
@@ -0,0 +1,28 @@
+function [names, absPaths, functionNames] = listDaqReaders()
+
+    % Collect paths of all root folders containing daq readers in a cell array
+    rootPath = {};
+    rootPath{1} = ndi.util.getPackageDir('ndi.daq.reader');
+    rootPath{2} = ndi.util.getPackageDir('ndi.setup.daq.reader');
+
+    % Find all m-files in these root folders.
+    fileExtension = '.m';
+    fileList = recursiveDir(rootPath, 'Type', 'file', 'FileType', fileExtension);
+    
+    absPaths = ndi.util.dir2abspath(fileList);
+    names = {fileList.name};
+    names = strrep(names, fileExtension, '');
+
+    if nargout < 2
+        clear absPath
+    end
+
+    if nargout == 3
+        functionNames = ndi.util.abspath2funcname(absPaths);
+    end
+
+    % Todo: Return a struct, with following fields:
+    % full path
+    % package/full function name
+    % category, i.e mfdaq, tplsm, ephys etc...
+end
\ No newline at end of file
diff --git a/+ndi/+setup/+daq/listDaqSystemClasses.m b/+ndi/+setup/+daq/listDaqSystemClasses.m
new file mode 100644
index 000000000..20d23f292
--- /dev/null
+++ b/+ndi/+setup/+daq/listDaqSystemClasses.m
@@ -0,0 +1,16 @@
+function [names, absPaths] = listDaqSystemClasses()
+    
+    rootPath = fileparts( which('ndi.version') );
+    rootPath = fullfile(rootPath, '+daq', '+system');
+
+    fileExtension = '.m';
+    fileList = recursiveDir(rootPath, 'Type', 'file', 'FileType', fileExtension);
+    
+    absPaths = ndi.util.dir2abspath(fileList);
+    names = {fileList.name};
+    names = strrep(names, fileExtension, '');
+    
+    if nargout < 2
+        clear absPath
+    end
+end
\ No newline at end of file
diff --git a/+ndi/+setup/+gui/DAQSystemConfigurator.mlapp b/+ndi/+setup/+gui/DAQSystemConfigurator.mlapp
new file mode 100644
index 000000000..5c1d82c1f
Binary files /dev/null and b/+ndi/+setup/+gui/DAQSystemConfigurator.mlapp differ
diff --git a/+ndi/+setup/+gui/createDaqReaderDialog.m b/+ndi/+setup/+gui/createDaqReaderDialog.m
new file mode 100644
index 000000000..a0a8fbef3
--- /dev/null
+++ b/+ndi/+setup/+gui/createDaqReaderDialog.m
@@ -0,0 +1,22 @@
+function createDaqReaderDialog()
+    
+    ndiDir = fileparts(fileparts(fileparts(fileparts(mfilename('fullpath')))));
+    % ndiDir = ndi.util.toolboxdir()
+    
+    variables = fullfile(ndiDir, '+ndi', '+daq', 'templates', ...
+                             'daq_reader_variables.json');
+
+    S = jsondecode(fileread(variables));
+
+    readers = ndi.setup.daq.listDaqReaders();
+    S.ReaderSuperClass = categorical(readers(1), readers);
+
+    se = structeditor.StructEditorApp(S, ...
+        'Title', 'Create New DAQ Reader', ...
+        'Theme', structeditor.enum.Theme.NDI);
+
+    se.OkButtonText = 'Create';
+    % uiwait(se)
+    % 
+    % disp(se.Data)
+end
\ No newline at end of file
diff --git a/+ndi/+setup/+gui/private/treeDir.m b/+ndi/+setup/+gui/private/treeDir.m
new file mode 100644
index 000000000..77e8bcc5c
--- /dev/null
+++ b/+ndi/+setup/+gui/private/treeDir.m
@@ -0,0 +1,120 @@
+function treeListing = treeDir(rootPath, options)
+%treeDir Create a tree listing of a directory tree
+%
+%   Syntax:
+%       treeListing = treeDir(rootPath, options)
+%   
+%
+%   Input arguments:
+%
+%   Output arguments:
+%       treeListing - A nested struct where each substruct represents a 
+%           folder and the bottommost is a fileList struct. 
+
+% Inspired by recursiveDir, but this function returns a custom struct meant
+% for being plotted in a uitree component
+%
+% Used by DaqSystemConfigurator
+
+    arguments
+        rootPath (1,:) string
+        options.TotalDepth (1,1) double = inf
+        options.IgnoreList (1,:) string = string.empty
+        options.Expression (1,1) string = ""
+        options.Type (1,1) string {validatestring(options.Type, {'file', 'folder', 'all'})} = "all"
+        options.FileType (1,1) string = ""
+    end
+    
+    treeListing = struct();
+    treeListing.FolderPath = rootPath;
+    [~, treeListing.FolderName] = fileparts(rootPath);
+    treeListing.Subfolders = struct.empty;
+    treeListing.Files = empty();
+
+    %combinedListing = empty();
+
+    if numel(rootPath) > 1
+        newListing = cell(1,numel(rootPath));
+        for i = 1:numel(rootPath)
+            nvpairs = namedargs2cell(options);
+            newListing{i} = treeDir(rootPath(i), nvpairs{:});
+        end
+        treeListing = cat(2, newListing{:});
+    else
+        % Find folders in root path
+        newListing = dir(fullfile(rootPath));
+        
+        % 1. Remove "shadow" files / hidden files
+        newListing(strncmp({newListing.name}, '.', 1)) = [];
+        
+        % 2. Filter listing by exclusion criteria
+        keep = true(1, numel(newListing));
+
+        % Remove folders that contain a word from the ignore list.
+        if ~isempty(options.IgnoreList)
+            ignore = contains({newListing.name}, options.IgnoreList);
+            keep = keep & ~ignore;
+        end
+
+        filteredListing = newListing(keep);
+        keep = true(1, numel(filteredListing)); 
+
+        % 3. Keep only list items that matches expression
+        if options.Expression ~= ""
+            isValidName = @(fname) ~isempty(regexp(fname, options.Expression, 'once'));
+            isMatch = cellfun(@(name) isValidName(name), {newListing.name} );
+            keep = keep & isMatch;
+        end
+
+
+        % 4. Select only files or folders if this is an option
+        if options.Type == "file"
+            keep = keep & ~[filteredListing.isdir];
+        elseif options.Type == "folder"
+            keep = keep & [filteredListing.isdir];
+        end
+
+        % 5. Filter by filetype if this is an option
+        if options.FileType ~= "" && ~strncmp(options.FileType, '.', 1)
+            options.FileType = sprintf('.%s', options.FileType);
+        end
+        
+        if options.Type == "file" && options.FileType ~= ""
+            [~, ~, ext] = fileparts({filteredListing.name});
+            isValidFiletype = strcmp(ext, options.FileType);
+            keep = keep & isValidFiletype;
+        end
+        
+        keepListing = filteredListing(keep);
+
+        isFile = ~[keepListing.isdir];
+        treeListing.Files = keepListing(isFile);
+
+        if options.TotalDepth > 0 && sum([filteredListing.isdir]) > 0
+            
+            % Continue search through subfolders that passed the filter
+            newRootPath = arrayfun(@(l) string(fullfile(l.folder, l.name)), filteredListing, 'uni', 1);
+            newRootPath(~[newListing.isdir])=[];
+            
+            options.TotalDepth = options.TotalDepth - 1;
+
+            nvpairs = namedargs2cell(options);
+            subListing = treeDir(newRootPath, nvpairs{:});
+            if ~isempty(subListing)
+                treeListing.Subfolders = subListing;
+            end
+        end
+    end
+end
+
+function S = empty()
+%empty Return an empty struct with the same fields the struct returned by dir.
+    S = struct(...
+    'name', {}, ...
+    'folder', {}, ...
+    'date', {}, ...
+    'bytes', {}, ...
+    'isdir', {}, ...
+    'datenum', {});
+    S = reshape(S, 0, 1);
+end
diff --git a/+ndi/+setup/+gui/selectDaqSystemDialog.mlapp b/+ndi/+setup/+gui/selectDaqSystemDialog.mlapp
new file mode 100644
index 000000000..3c22ad3b6
Binary files /dev/null and b/+ndi/+setup/+gui/selectDaqSystemDialog.mlapp differ
diff --git a/+ndi/+setup/@DaqSystemConfiguration/DaqSystemConfiguration.m b/+ndi/+setup/@DaqSystemConfiguration/DaqSystemConfiguration.m
index e7d1d006e..3d5bc751a 100644
--- a/+ndi/+setup/@DaqSystemConfiguration/DaqSystemConfiguration.m
+++ b/+ndi/+setup/@DaqSystemConfiguration/DaqSystemConfiguration.m
@@ -3,7 +3,7 @@
 
     properties
         % Name - A name for the DAQ system device
-        Name (1,1) string = missing
+        Name (1,1) string = ""
 
         % DaqSystemClass - Full class name for the class to use for
         % creating an NDI DAQ system object
@@ -45,7 +45,7 @@
     methods
         function obj = DaqSystemConfiguration(name, propertyValues)
             arguments
-                name
+                name (1,1) string = ""
                 propertyValues.?ndi.setup.DaqSystemConfiguration
             end
 
@@ -160,6 +160,14 @@ function export(obj, configFileName)
             configFilePath = fullfile(importDir, [deviceName, '.json']);
             daqSystemConfiguration = ndi.setup.DaqSystemConfiguration.fromConfigFile(configFilePath);
         end
+
+        function daqSystemConfiguration = fromDeviceName(deviceName)
+            ndi.globals; 
+            importDir = fullfile(ndi_globals.path.commonpath, 'daq_systems');
+            configFilePath = recursiveDir(importDir, 'FileType', '.json', 'Expression', deviceName, 'OutputType', 'FilePath');
+            assert(iscell(configFilePath) && numel(configFilePath)==1)
+            daqSystemConfiguration = ndi.setup.DaqSystemConfiguration.fromConfigFile(configFilePath{1});
+        end
     end
 end
 
diff --git a/+ndi/+util/abspath2funcname.m b/+ndi/+util/abspath2funcname.m
new file mode 100644
index 000000000..8b75c21b7
--- /dev/null
+++ b/+ndi/+util/abspath2funcname.m
@@ -0,0 +1,59 @@
+function functionName = abspath2funcname(pathStr)
+%abspath2funcname Get function name for .m file given as absolute pathstring
+%
+%   Returns package-prefixed function name given the absolute path of a .m
+%   file. pathStr can be a character vector, a cell array of character
+%   vectors or a string array. If the input is an array, the output will be
+%   a cell array
+%
+%   Syntax:
+%       functionName = ndi.util.abspath2funcname(pathStr)
+
+    if isa(pathStr, 'cell')
+        functionName = cellfun(@(c) ndi.util.abspath2funcname(c), ...
+            pathStr, 'UniformOutput', false);
+        return
+    elseif isa(pathStr, 'string') && numel(pathStr) > 1
+        functionName = arrayfun(@(str) ndi.util.abspath2funcname(str), ...
+            pathStr, 'UniformOutput', false);
+        return
+    end
+
+    % Get function name, taking package into account
+    [folderPath, functionName, ext] = fileparts(pathStr);
+    
+    assert(strcmp(ext, '.m'), 'pathStr must point to a .m (function) file')
+    
+    packageName = pathstr2packagename(folderPath);
+    functionName = strcat(packageName, '.', functionName);
+end
+
+function packageName = pathstr2packagename(pathStr)
+%pathstr2packagename Convert a path string to a string with name of package
+%
+%       packageName = pathstr2packagename(pathStr)
+%
+%   EXAMPLE:
+% 
+%    pathStr =
+%       '/Users/username/Documents/MATLAB/NDI-matlab/+ndi/+session'
+%
+%    packageName = pathstr2packagename(pathStr)
+%
+%    packageName =
+%       'ndi.session'
+
+    assert(isfolder(pathStr), 'Path must point to a folder.')
+       
+    % Split pathstr by foldernames
+    splitFolderNames = strsplit(pathStr, filesep);
+    
+    % Find all folders that are a package
+    isPackage = cellfun(@(str) strncmp(str, '+', 1), splitFolderNames );
+    
+    % Create output string
+    packageFolderNames = splitFolderNames(isPackage);
+    packageFolderNames = strrep(packageFolderNames, '+', '');
+    
+    packageName = strjoin(packageFolderNames, '.');
+end
diff --git a/+ndi/+util/dir2abspath.m b/+ndi/+util/dir2abspath.m
new file mode 100644
index 000000000..ac6b5c538
--- /dev/null
+++ b/+ndi/+util/dir2abspath.m
@@ -0,0 +1,9 @@
+function absolutePathList = abspath(folderContentList)
+%abspath Combine folder and name for each element in a folderContent struct array
+    
+    absolutePathList = cell(size(folderContentList));
+    for i = 1:numel(folderContentList)
+        absolutePathList{i} = fullfile(folderContentList(i).folder, ...
+            folderContentList(i).name);
+    end
+end
\ No newline at end of file
diff --git a/+ndi/+util/getPackageDir.m b/+ndi/+util/getPackageDir.m
new file mode 100644
index 000000000..ebd7cb4ab
--- /dev/null
+++ b/+ndi/+util/getPackageDir.m
@@ -0,0 +1,8 @@
+function pathName = getPackageDir(packageName)
+    s = what(strrep(packageName, '.', filesep));
+    if isempty(s)
+        error('No path was found for package "%s"', packageName)
+    else
+        pathName = s.path;
+    end
+end
\ No newline at end of file
diff --git a/apps/NDIDaqSystemConfig.m b/apps/NDIDaqSystemConfig.m
new file mode 100644
index 000000000..8cd3dd833
--- /dev/null
+++ b/apps/NDIDaqSystemConfig.m
@@ -0,0 +1,60 @@
+function app = NDIDaqSystemConfig(datasetFolder, epochFolder, epochOrganization, daqSystemConfiguration)
+% NDIDaqSystemConfig - Launcher for the DAQ System Configuration App
+%
+% Syntax: 
+%   app = NDIDaqSystemConfig(datasetFolder) opens the NDI DAQ System
+%        Configurator for a selected dataset.
+%
+% Input Arguments:
+%   datasetFolder (string)      - The path to a root dataset folder for an NDI dataset.
+%   epochFolder (string)        - The relative path (relative to datasetFolder) to
+%                                 one subfolder containing epoch files
+%   epochOrganization (string)  - The organization type of the epochs, which can
+%                                 be "flat" or "nested".
+%   daqSystemConfiguration (1,1) ndi.setup.DaqSystemConfiguration - An instance
+%                                 of the DAQ system configuration class.
+%
+% Output Arguments:
+%   app - An instance of the DAQ System Configurator GUI.
+%
+% If inputs are not provided, a set of dialogs will prompt the user for the
+% necessary information to launch the app.
+
+    arguments
+        datasetFolder (1,1) string = missing
+        epochFolder (1,1) string = missing
+        epochOrganization (1,1) string ...
+            {mustBeMember(epochOrganization, ["flat", "nested", ""])} = ""
+        daqSystemConfiguration (1,1) ndi.setup.DaqSystemConfiguration = ndi.setup.DaqSystemConfiguration;
+    end
+
+    if ismissing(datasetFolder)
+        answer = questdlg('Please select an NDI dataset folder', 'Select folder', 'Ok', 'Cancel', 'Ok');
+        if ~strcmp(answer, 'Ok'); error("User canceled."); end
+        datasetFolder = uigetdir();
+        if datasetFolder == 0; error("User canceled."); end
+    end
+
+    if ismissing(epochFolder)
+        answer = questdlg('Please select a subfolder containing epoch files', 'Select folder', 'Ok', 'Cancel', 'Ok');
+        if ~strcmp(answer, 'Ok'); error("User canceled."); end
+        epochFolder = uigetdir(datasetFolder);
+        if epochFolder == 0; error("User canceled."); end
+        epochFolder = strrep(epochFolder, datasetFolder, '');
+    end
+
+    if epochOrganization == ""
+        answer = questdlg('Is the epochs organised in a flat or nested folder hierachy?', 'Select hierarchy type', 'Flat', 'Nested', 'Flat');
+        epochOrganization = string(lower(answer));
+    end
+
+    app = ndi.setup.gui.DAQSystemConfigurator(...
+        datasetFolder, ...
+        epochFolder, ...
+        epochOrganization, ...
+        daqSystemConfiguration);
+
+    if nargout < 1
+        clear app
+    end
+end
diff --git a/apps/NDIDatasetWizard.m b/apps/NDIDatasetWizard.m
new file mode 100644
index 000000000..ed191ac11
--- /dev/null
+++ b/apps/NDIDatasetWizard.m
@@ -0,0 +1,20 @@
+function app = NDIDatasetWizard(datasetFolder)
+% NDIDatasetWizard - Launcher for the Dataset Wizard
+%
+%   Syntax:
+%       app = NDIDatasetWizard(datasetFolder) Launches the Dataset Wizard
+%
+% Input Arguments:
+%   datasetFolder (string) - Optional
+%     The root folder of the dataset to be used in the wizard.
+
+    arguments
+        datasetFolder (1,1) string = missing
+    end
+    
+    app = ndi.dataset.gui.DatasetWizardApp(datasetFolder);
+
+    if nargout < 1
+        clear app
+    end
+end
diff --git a/ndi-matlab-dependencies.json b/ndi-matlab-dependencies.json
index 57555a556..265431c67 100644
--- a/ndi-matlab-dependencies.json
+++ b/ndi-matlab-dependencies.json
@@ -9,8 +9,16 @@
 		"https://github.com/VH-lab/DID-matlab",
 		"https://github.com/VH-lab/NDR-matlab",
 		"https://github.com/ehennestad/Catalog",
+		"https://github.com/ehennestad/StructEditor",
+		"https://github.com/ehennestad/WidgetTable",
+		"https://github.com/ehennestad/openMINDS-MATLAB-GUI",
 		"https://github.com/a-ma72/mksqlite",
 		"https://github.com/Waltham-Data-Science/NDI-compress-matlabp",
-		"fex://c519502d-d45f-4dbd-8564-df06ab49717f"
+		"https://github.com/VervaekeLab/NANSEN",
+		"fex://7504e82c-a4fa-4757-8c5c-ad77094a8acd",
+		"fex://3171ed18-2788-4e49-a0cf-785bbd4d0a13",
+		"fex://d00d9727-fdd6-417d-9ee8-99c97b77eef5",
+		"fex://e5a9c7a3-4a80-11e4-9553-005056977bd0",
+		"fex://78895307-cc36-4970-8b66-0697da8f9352"
         ]
 }
diff --git a/ndi_install.m b/ndi_install.m
index 55ffdf28c..a4564bdf5 100644
--- a/ndi_install.m
+++ b/ndi_install.m
@@ -425,7 +425,7 @@ function installFexPackage(toolboxIdentifier, installLocation)
         unzip(tempFilepath, fullfile(installLocation, S.name)); delete(C)
 
     elseif endsWith(addonUrl, '/mltbx')
-        tempFile = websave(fullfile(tempdir,'temp.zip'), addonUrl );
+        tempFile = websave(fullfile(tempdir,'temp.mltbx'), addonUrl );
         matlab.addons.install(tempFile);
         delete(tempFile)
     end