diff -r 2d7109286408 -r 543f1613c2da nbproject/configurations.xml
--- a/nbproject/configurations.xml	Sat Aug 25 17:04:11 2018 +0200
+++ b/nbproject/configurations.xml	Sat Aug 25 17:39:27 2018 +0200
@@ -5,11 +5,11 @@
                    displayName="Header Files"
                    projectFiles="true">
       <itemPath>src/BooleanDataTypeReader.h</itemPath>
-      <itemPath>include/relpipe/reader/DataTypeReader.h</itemPath>
-      <itemPath>include/relpipe/reader/DataTypeReaderBase.h</itemPath>
+      <itemPath>src/DataTypeReader.h</itemPath>
+      <itemPath>src/DataTypeReaderBase.h</itemPath>
       <itemPath>src/DataTypeReaderCatalog.h</itemPath>
       <itemPath>src/IntegerDataTypeReader.h</itemPath>
-      <itemPath>include/relpipe/reader/RelpipeReaderException.h</itemPath>
+      <itemPath>src/RelpipeReaderException.h</itemPath>
       <itemPath>src/StringDataTypeReader.h</itemPath>
       <itemPath>include/relpipe/reader/TypeId.h</itemPath>
       <itemPath>include/relpipe/reader/typedefs.h</itemPath>
@@ -49,21 +49,6 @@
           <commandLine>-fsanitize=address</commandLine>
         </ccTool>
       </compileType>
-      <item path="include/relpipe/reader/DataTypeReader.h"
-            ex="false"
-            tool="3"
-            flavor2="0">
-      </item>
-      <item path="include/relpipe/reader/DataTypeReaderBase.h"
-            ex="false"
-            tool="3"
-            flavor2="0">
-      </item>
-      <item path="include/relpipe/reader/RelpipeReaderException.h"
-            ex="false"
-            tool="3"
-            flavor2="0">
-      </item>
       <item path="include/relpipe/reader/TypeId.h" ex="false" tool="3" flavor2="0">
       </item>
       <item path="include/relpipe/reader/typedefs.h" ex="false" tool="3" flavor2="0">
@@ -72,12 +57,18 @@
       </item>
       <item path="src/DataTypeReader.cpp" ex="false" tool="1" flavor2="0">
       </item>
+      <item path="src/DataTypeReader.h" ex="false" tool="3" flavor2="0">
+      </item>
       <item path="src/DataTypeReaderBase.cpp" ex="false" tool="1" flavor2="0">
       </item>
+      <item path="src/DataTypeReaderBase.h" ex="false" tool="3" flavor2="0">
+      </item>
       <item path="src/DataTypeReaderCatalog.h" ex="false" tool="3" flavor2="0">
       </item>
       <item path="src/IntegerDataTypeReader.h" ex="false" tool="3" flavor2="0">
       </item>
+      <item path="src/RelpipeReaderException.h" ex="false" tool="3" flavor2="0">
+      </item>
       <item path="src/StringDataTypeReader.h" ex="false" tool="3" flavor2="0">
       </item>
     </conf>
@@ -101,21 +92,6 @@
           <developmentMode>5</developmentMode>
         </asmTool>
       </compileType>
-      <item path="include/relpipe/reader/DataTypeReader.h"
-            ex="false"
-            tool="3"
-            flavor2="0">
-      </item>
-      <item path="include/relpipe/reader/DataTypeReaderBase.h"
-            ex="false"
-            tool="3"
-            flavor2="0">
-      </item>
-      <item path="include/relpipe/reader/RelpipeReaderException.h"
-            ex="false"
-            tool="3"
-            flavor2="0">
-      </item>
       <item path="include/relpipe/reader/TypeId.h" ex="false" tool="3" flavor2="0">
       </item>
       <item path="include/relpipe/reader/typedefs.h" ex="false" tool="3" flavor2="0">
@@ -124,12 +100,18 @@
       </item>
       <item path="src/DataTypeReader.cpp" ex="false" tool="1" flavor2="0">
       </item>
+      <item path="src/DataTypeReader.h" ex="false" tool="3" flavor2="0">
+      </item>
       <item path="src/DataTypeReaderBase.cpp" ex="false" tool="1" flavor2="0">
       </item>
+      <item path="src/DataTypeReaderBase.h" ex="false" tool="3" flavor2="0">
+      </item>
       <item path="src/DataTypeReaderCatalog.h" ex="false" tool="3" flavor2="0">
       </item>
       <item path="src/IntegerDataTypeReader.h" ex="false" tool="3" flavor2="0">
       </item>
+      <item path="src/RelpipeReaderException.h" ex="false" tool="3" flavor2="0">
+      </item>
       <item path="src/StringDataTypeReader.h" ex="false" tool="3" flavor2="0">
       </item>
     </conf>