diff -r 0f9f7d6564cd -r 23354fc917f4 nbproject/configurations.xml
--- a/nbproject/configurations.xml	Thu Nov 29 22:30:12 2018 +0100
+++ b/nbproject/configurations.xml	Sat Dec 01 23:22:41 2018 +0100
@@ -47,40 +47,31 @@
       <itemPath>/usr/share/cmake-3.10/Modules/CMakeCXXCompilerABI.cpp</itemPath>
       <itemPath>/usr/share/cmake-3.10/Modules/CMakeCompilerABI.h</itemPath>
     </logicalFolder>
-    <logicalFolder name="relpipe-out-chart_autogen"
-                   displayName="relpipe-out-chart_autogen"
-                   projectFiles="true"
-                   root="build/Debug/src/relpipe-out-chart_autogen">
-      <logicalFolder name="EWIEGA46WW" displayName="EWIEGA46WW" projectFiles="true">
-        <itemPath>build/Debug/src/relpipe-out-chart_autogen/EWIEGA46WW/moc_QtRelationalReaderStringHadler.cpp</itemPath>
-        <itemPath>build/Debug/src/relpipe-out-chart_autogen/EWIEGA46WW/moc_RelpipeChartMainWindow.cpp</itemPath>
-        <itemPath>build/Debug/src/relpipe-out-chart_autogen/EWIEGA46WW/moc_RelpipeChartWidget.cpp</itemPath>
-        <itemPath>build/Debug/src/relpipe-out-chart_autogen/EWIEGA46WW/moc_RelpipeTableModel.cpp</itemPath>
-      </logicalFolder>
-      <logicalFolder name="include" displayName="include" projectFiles="true">
-        <itemPath>build/Debug/src/relpipe-out-chart_autogen/include/ui_RelpipeChartMainWindow.h</itemPath>
-      </logicalFolder>
-      <itemPath>build/Debug/src/relpipe-out-chart_autogen/mocs_compilation.cpp</itemPath>
-    </logicalFolder>
     <df root="." name="0">
-      <df name="build">
-        <df name="Debug">
-          <df name="src">
-            <df name="relpipe-out-gui_autogen">
-              <in>mocs_compilation.cpp</in>
-            </df>
-          </df>
-        </df>
-      </df>
       <df name="src">
         <in>RelpipeChartMainWindow.cpp</in>
         <in>RelpipeChartMainWindow.h</in>
         <in>RelpipeChartMainWindow.ui</in>
         <in>RelpipeChartWidget.h</in>
         <in>RelpipeTableModel.h</in>
-        <in>relpipe-out-chart.cpp</in>
+        <in>relpipe-out-gui.cpp</in>
       </df>
     </df>
+    <logicalFolder name="relpipe-out-gui_autogen"
+                   displayName="relpipe-out-gui_autogen"
+                   projectFiles="true"
+                   root="build/Debug/src/relpipe-out-gui_autogen">
+      <logicalFolder name="EWIEGA46WW" displayName="EWIEGA46WW" projectFiles="true">
+        <itemPath>build/Debug/src/relpipe-out-gui_autogen/EWIEGA46WW/moc_QtRelationalReaderStringHadler.cpp</itemPath>
+        <itemPath>build/Debug/src/relpipe-out-gui_autogen/EWIEGA46WW/moc_RelpipeChartMainWindow.cpp</itemPath>
+        <itemPath>build/Debug/src/relpipe-out-gui_autogen/EWIEGA46WW/moc_RelpipeChartWidget.cpp</itemPath>
+        <itemPath>build/Debug/src/relpipe-out-gui_autogen/EWIEGA46WW/moc_RelpipeTableModel.cpp</itemPath>
+      </logicalFolder>
+      <logicalFolder name="include" displayName="include" projectFiles="true">
+        <itemPath>build/Debug/src/relpipe-out-gui_autogen/include/ui_RelpipeChartMainWindow.h</itemPath>
+      </logicalFolder>
+      <itemPath>build/Debug/src/relpipe-out-gui_autogen/mocs_compilation.cpp</itemPath>
+    </logicalFolder>
     <logicalFolder name="ExternalFiles"
                    displayName="Important Files"
                    projectFiles="false"
@@ -104,8 +95,6 @@
       </toolsSet>
       <flagsDictionary>
         <element flagsID="0" commonFlags="-fsanitize=address -fPIC -std=gnu++11"/>
-        <element flagsID="1"
-                 commonFlags="-mtune=generic -march=x86-64 -std=gnu++11 -fsanitize=address -fPIC -fstack-protector-strong"/>
       </flagsDictionary>
       <codeAssistance>
       </codeAssistance>
@@ -115,6 +104,27 @@
           <buildCommand>${MAKE} -f Makefile</buildCommand>
           <cleanCommand>${MAKE} -f Makefile clean</cleanCommand>
           <executablePath>build/Debug/src/relpipe-out-gui</executablePath>
+          <ccTool>
+            <incDir>
+              <pElem>build/Debug/src</pElem>
+              <pElem>src</pElem>
+              <pElem>build/Debug/src/relpipe-out-gui_autogen/include</pElem>
+              <pElem>../relpipe-lib-reader.cpp/include</pElem>
+              <pElem>../relpipe-lib-cli.cpp/include</pElem>
+              <pElem>/usr/include/x86_64-linux-gnu/qt5</pElem>
+              <pElem>/usr/include/x86_64-linux-gnu/qt5/QtWidgets</pElem>
+              <pElem>/usr/include/x86_64-linux-gnu/qt5/QtGui</pElem>
+              <pElem>/usr/include/x86_64-linux-gnu/qt5/QtCore</pElem>
+              <pElem>/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++</pElem>
+              <pElem>/usr/include/x86_64-linux-gnu/qt5/QtCharts</pElem>
+            </incDir>
+            <preprocessorList>
+              <Elem>QT_CHARTS_LIB</Elem>
+              <Elem>QT_CORE_LIB</Elem>
+              <Elem>QT_GUI_LIB</Elem>
+              <Elem>QT_WIDGETS_LIB</Elem>
+            </preprocessorList>
+          </ccTool>
         </makeTool>
         <preBuild>
           <preBuildCommandWorkingDir>build/Debug</preBuildCommandWorkingDir>
@@ -127,33 +137,26 @@
             tool="1"
             flavor2="11">
       </item>
-      <item path="build/Debug/src/relpipe-out-chart_autogen/EWIEGA46WW/moc_QtRelationalReaderStringHadler.cpp"
+      <item path="build/Debug/src/relpipe-out-gui_autogen/EWIEGA46WW/moc_QtRelationalReaderStringHadler.cpp"
             ex="true"
             tool="3"
             flavor2="0">
       </item>
-      <item path="build/Debug/src/relpipe-out-chart_autogen/EWIEGA46WW/moc_RelpipeChartMainWindow.cpp"
+      <item path="build/Debug/src/relpipe-out-gui_autogen/EWIEGA46WW/moc_RelpipeChartMainWindow.cpp"
             ex="true"
             tool="3"
             flavor2="0">
       </item>
-      <item path="build/Debug/src/relpipe-out-chart_autogen/EWIEGA46WW/moc_RelpipeChartWidget.cpp"
+      <item path="build/Debug/src/relpipe-out-gui_autogen/EWIEGA46WW/moc_RelpipeChartWidget.cpp"
             ex="true"
             tool="3"
             flavor2="0">
       </item>
-      <item path="build/Debug/src/relpipe-out-chart_autogen/EWIEGA46WW/moc_RelpipeTableModel.cpp"
+      <item path="build/Debug/src/relpipe-out-gui_autogen/EWIEGA46WW/moc_RelpipeTableModel.cpp"
             ex="true"
             tool="3"
             flavor2="0">
       </item>
-      <item path="build/Debug/src/relpipe-out-chart_autogen/mocs_compilation.cpp"
-            ex="false"
-            tool="1"
-            flavor2="8">
-        <ccTool flags="1">
-        </ccTool>
-      </item>
       <item path="build/Debug/src/relpipe-out-gui_autogen/mocs_compilation.cpp"
             ex="false"
             tool="1"
@@ -161,77 +164,18 @@
         <ccTool flags="0">
         </ccTool>
       </item>
-      <folder path="0">
-        <ccTool>
-          <incDir>
-            <pElem>build/Debug/src</pElem>
-            <pElem>src</pElem>
-            <pElem>build/Debug/src/relpipe-out-gui_autogen/include</pElem>
-            <pElem>../relpipe-lib-reader.cpp/include</pElem>
-            <pElem>../relpipe-lib-cli.cpp/include</pElem>
-            <pElem>/usr/include/x86_64-linux-gnu/qt5</pElem>
-            <pElem>/usr/include/x86_64-linux-gnu/qt5/QtWidgets</pElem>
-            <pElem>/usr/include/x86_64-linux-gnu/qt5/QtGui</pElem>
-            <pElem>/usr/include/x86_64-linux-gnu/qt5/QtCore</pElem>
-            <pElem>/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++</pElem>
-            <pElem>/usr/include/x86_64-linux-gnu/qt5/QtCharts</pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>QT_CHARTS_LIB</Elem>
-            <Elem>QT_CORE_LIB</Elem>
-            <Elem>QT_GUI_LIB</Elem>
-            <Elem>QT_WIDGETS_LIB</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
       <folder path="Modules">
         <ccTool>
           <incDir>
-            <pElem>build/Debug/src</pElem>
-            <pElem>src</pElem>
-            <pElem>build/Debug/src/relpipe-out-gui_autogen/include</pElem>
-            <pElem>../relpipe-lib-reader.cpp/include</pElem>
-            <pElem>../relpipe-lib-cli.cpp/include</pElem>
-            <pElem>/usr/include/x86_64-linux-gnu/qt5</pElem>
-            <pElem>/usr/include/x86_64-linux-gnu/qt5/QtWidgets</pElem>
-            <pElem>/usr/include/x86_64-linux-gnu/qt5/QtGui</pElem>
-            <pElem>/usr/include/x86_64-linux-gnu/qt5/QtCore</pElem>
-            <pElem>/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++</pElem>
-            <pElem>/usr/include/x86_64-linux-gnu/qt5/QtCharts</pElem>
             <pElem>/usr/include</pElem>
           </incDir>
-          <preprocessorList>
-            <Elem>QT_CHARTS_LIB</Elem>
-            <Elem>QT_CORE_LIB</Elem>
-            <Elem>QT_GUI_LIB</Elem>
-            <Elem>QT_WIDGETS_LIB</Elem>
-          </preprocessorList>
-        </ccTool>
-      </folder>
-      <folder path="relpipe-out-chart_autogen">
-        <ccTool>
-          <incDir>
-            <pElem>/usr/include/x86_64-linux-gnu/qt5/QtCore</pElem>
-            <pElem>../relpipe-lib-reader.cpp/include/relpipe/reader/handlers</pElem>
-            <pElem>src</pElem>
-            <pElem>build/Debug/src/relpipe-out-chart_autogen/EWIEGA46WW</pElem>
-            <pElem>../relpipe-lib-reader.cpp/include/relpipe/reader</pElem>
-            <pElem>/usr/include/x86_64-linux-gnu/qt5/QtGui</pElem>
-            <pElem>/usr/include/x86_64-linux-gnu/qt5/QtWidgets</pElem>
-            <pElem>build/Debug/src/relpipe-out-chart_autogen/include</pElem>
-            <pElem>/usr/include/x86_64-linux-gnu/qt5/QtCharts</pElem>
-            <pElem>build/Debug/src/relpipe-out-chart_autogen</pElem>
-            <pElem>/usr/include/x86_64-linux-gnu/qt5</pElem>
-            <pElem>../relpipe-lib-reader.cpp/include</pElem>
-            <pElem>build/Debug/src</pElem>
-          </incDir>
         </ccTool>
       </folder>
       <item path="src/RelpipeChartMainWindow.cpp" ex="false" tool="1" flavor2="8">
         <ccTool flags="0">
         </ccTool>
       </item>
-      <item path="src/relpipe-out-chart.cpp" ex="false" tool="1" flavor2="8">
+      <item path="src/relpipe-out-gui.cpp" ex="false" tool="1" flavor2="8">
         <ccTool flags="0">
         </ccTool>
       </item>
@@ -275,7 +219,7 @@
       </item>
       <item path="src/RelpipeTableModel.h" ex="false" tool="3" flavor2="0">
       </item>
-      <item path="src/relpipe-out-chart.cpp" ex="false" tool="1" flavor2="0">
+      <item path="src/relpipe-out-gui.cpp" ex="false" tool="1" flavor2="0">
       </item>
     </conf>
   </confs>