--- a/nbproject/configurations.xml	Sat Jul 28 15:42:33 2018 +0200
+++ b/nbproject/configurations.xml	Mon Aug 13 20:30:55 2018 +0200
@@ -7,15 +7,15 @@
       <itemPath>src/types/BooleanDataTypeWriter.h</itemPath>
       <itemPath>src/DataTypeWriter.h</itemPath>
       <itemPath>src/DataTypeWriterBase.h</itemPath>
-      <itemPath>include/Factory.h</itemPath>
+      <itemPath>include/relpipe/writer/Factory.h</itemPath>
       <itemPath>src/types/IntegerDataTypeWriter.h</itemPath>
-      <itemPath>include/RelationalWriter.h</itemPath>
-      <itemPath>include/RelpipeWriterException.h</itemPath>
+      <itemPath>include/relpipe/writer/RelationalWriter.h</itemPath>
+      <itemPath>include/relpipe/writer/RelpipeWriterException.h</itemPath>
       <itemPath>src/StreamRelationalWriter.h</itemPath>
       <itemPath>src/types/StringDataTypeWriter.h</itemPath>
-      <itemPath>include/TypeId.h</itemPath>
+      <itemPath>include/relpipe/writer/TypeId.h</itemPath>
       <itemPath>src/format.h</itemPath>
-      <itemPath>include/typedefs.h</itemPath>
+      <itemPath>include/relpipe/writer/typedefs.h</itemPath>
     </logicalFolder>
     <logicalFolder name="ResourceFiles"
                    displayName="Resource Files"
@@ -51,15 +51,21 @@
           <commandLine>-fsanitize=address</commandLine>
         </ccTool>
       </compileType>
-      <item path="include/Factory.h" ex="false" tool="3" flavor2="0">
+      <item path="include/relpipe/writer/Factory.h" ex="false" tool="3" flavor2="0">
       </item>
-      <item path="include/RelationalWriter.h" ex="false" tool="3" flavor2="0">
+      <item path="include/relpipe/writer/RelationalWriter.h"
+            ex="false"
+            tool="3"
+            flavor2="0">
       </item>
-      <item path="include/RelpipeWriterException.h" ex="false" tool="3" flavor2="0">
+      <item path="include/relpipe/writer/RelpipeWriterException.h"
+            ex="false"
+            tool="3"
+            flavor2="0">
       </item>
-      <item path="include/TypeId.h" ex="false" tool="3" flavor2="0">
+      <item path="include/relpipe/writer/TypeId.h" ex="false" tool="3" flavor2="0">
       </item>
-      <item path="include/typedefs.h" ex="false" tool="3" flavor2="0">
+      <item path="include/relpipe/writer/typedefs.h" ex="false" tool="3" flavor2="0">
       </item>
       <item path="src/DataTypeWriter.h" ex="false" tool="3" flavor2="0">
       </item>
@@ -98,15 +104,21 @@
           <developmentMode>5</developmentMode>
         </asmTool>
       </compileType>
-      <item path="include/Factory.h" ex="false" tool="3" flavor2="0">
+      <item path="include/relpipe/writer/Factory.h" ex="false" tool="3" flavor2="0">
       </item>
-      <item path="include/RelationalWriter.h" ex="false" tool="3" flavor2="0">
+      <item path="include/relpipe/writer/RelationalWriter.h"
+            ex="false"
+            tool="3"
+            flavor2="0">
       </item>
-      <item path="include/RelpipeWriterException.h" ex="false" tool="3" flavor2="0">
+      <item path="include/relpipe/writer/RelpipeWriterException.h"
+            ex="false"
+            tool="3"
+            flavor2="0">
       </item>
-      <item path="include/TypeId.h" ex="false" tool="3" flavor2="0">
+      <item path="include/relpipe/writer/TypeId.h" ex="false" tool="3" flavor2="0">
       </item>
-      <item path="include/typedefs.h" ex="false" tool="3" flavor2="0">
+      <item path="include/relpipe/writer/typedefs.h" ex="false" tool="3" flavor2="0">
       </item>
       <item path="src/DataTypeWriter.h" ex="false" tool="3" flavor2="0">
       </item>