--- a/nbproject/configurations.xml	Sat Aug 25 17:39:27 2018 +0200
+++ b/nbproject/configurations.xml	Sat Aug 25 18:16:53 2018 +0200
@@ -4,13 +4,16 @@
     <logicalFolder name="HeaderFiles"
                    displayName="Header Files"
                    projectFiles="true">
-      <itemPath>src/BooleanDataTypeReader.h</itemPath>
+      <itemPath>src/types/BooleanDataTypeReader.h</itemPath>
       <itemPath>src/DataTypeReader.h</itemPath>
       <itemPath>src/DataTypeReaderBase.h</itemPath>
       <itemPath>src/DataTypeReaderCatalog.h</itemPath>
-      <itemPath>src/IntegerDataTypeReader.h</itemPath>
-      <itemPath>src/RelpipeReaderException.h</itemPath>
-      <itemPath>src/StringDataTypeReader.h</itemPath>
+      <itemPath>include/relpipe/reader/Factory.h</itemPath>
+      <itemPath>src/types/IntegerDataTypeReader.h</itemPath>
+      <itemPath>include/relpipe/reader/RelationalReader.h</itemPath>
+      <itemPath>include/relpipe/reader/RelpipeReaderException.h</itemPath>
+      <itemPath>src/StreamRelationalReader.h</itemPath>
+      <itemPath>src/types/StringDataTypeReader.h</itemPath>
       <itemPath>include/relpipe/reader/TypeId.h</itemPath>
       <itemPath>include/relpipe/reader/typedefs.h</itemPath>
     </logicalFolder>
@@ -22,7 +25,7 @@
                    displayName="Source Files"
                    projectFiles="true">
       <itemPath>src/DataTypeReader.cpp</itemPath>
-      <itemPath>src/DataTypeReaderBase.cpp</itemPath>
+      <itemPath>src/Factory.cpp</itemPath>
     </logicalFolder>
     <logicalFolder name="TestFiles"
                    displayName="Test Files"
@@ -48,28 +51,45 @@
         <ccTool>
           <commandLine>-fsanitize=address</commandLine>
         </ccTool>
+        <linkerTool>
+          <linkerLibItems>
+            <linkerOptionItem>`pkg-config --libs relpipe-lib-protocol.cpp`</linkerOptionItem>
+          </linkerLibItems>
+        </linkerTool>
       </compileType>
+      <item path="include/relpipe/reader/Factory.h" ex="false" tool="3" flavor2="0">
+      </item>
+      <item path="include/relpipe/reader/RelationalReader.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">
       </item>
-      <item path="src/BooleanDataTypeReader.h" ex="false" tool="3" flavor2="0">
-      </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 path="src/Factory.cpp" ex="false" tool="1" flavor2="0">
+      </item>
+      <item path="src/StreamRelationalReader.h" ex="false" tool="3" flavor2="0">
       </item>
-      <item path="src/RelpipeReaderException.h" ex="false" tool="3" flavor2="0">
+      <item path="src/types/BooleanDataTypeReader.h" ex="false" tool="3" flavor2="0">
       </item>
-      <item path="src/StringDataTypeReader.h" ex="false" tool="3" flavor2="0">
+      <item path="src/types/IntegerDataTypeReader.h" ex="false" tool="3" flavor2="0">
+      </item>
+      <item path="src/types/StringDataTypeReader.h" ex="false" tool="3" flavor2="0">
       </item>
     </conf>
     <conf name="Release" type="2">
@@ -91,28 +111,45 @@
         <asmTool>
           <developmentMode>5</developmentMode>
         </asmTool>
+        <linkerTool>
+          <linkerLibItems>
+            <linkerOptionItem>`pkg-config --libs relpipe-lib-protocol.cpp`</linkerOptionItem>
+          </linkerLibItems>
+        </linkerTool>
       </compileType>
+      <item path="include/relpipe/reader/Factory.h" ex="false" tool="3" flavor2="0">
+      </item>
+      <item path="include/relpipe/reader/RelationalReader.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">
       </item>
-      <item path="src/BooleanDataTypeReader.h" ex="false" tool="3" flavor2="0">
-      </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 path="src/Factory.cpp" ex="false" tool="1" flavor2="0">
+      </item>
+      <item path="src/StreamRelationalReader.h" ex="false" tool="3" flavor2="0">
       </item>
-      <item path="src/RelpipeReaderException.h" ex="false" tool="3" flavor2="0">
+      <item path="src/types/BooleanDataTypeReader.h" ex="false" tool="3" flavor2="0">
       </item>
-      <item path="src/StringDataTypeReader.h" ex="false" tool="3" flavor2="0">
+      <item path="src/types/IntegerDataTypeReader.h" ex="false" tool="3" flavor2="0">
+      </item>
+      <item path="src/types/StringDataTypeReader.h" ex="false" tool="3" flavor2="0">
       </item>
     </conf>
   </confs>