--- a/nbproject/configurations.xml	Sun Jul 15 00:43:42 2018 +0200
+++ b/nbproject/configurations.xml	Mon Aug 13 21:30:32 2018 +0200
@@ -5,14 +5,14 @@
                    displayName="Header Files"
                    projectFiles="true">
       <itemPath>src/BooleanDataTypeReader.h</itemPath>
-      <itemPath>include/DataTypeReader.h</itemPath>
-      <itemPath>include/DataTypeReaderBase.h</itemPath>
+      <itemPath>include/relpipe/reader/DataTypeReader.h</itemPath>
+      <itemPath>include/relpipe/reader/DataTypeReaderBase.h</itemPath>
       <itemPath>src/DataTypeReaderCatalog.h</itemPath>
       <itemPath>src/IntegerDataTypeReader.h</itemPath>
-      <itemPath>include/RelpipeReaderException.h</itemPath>
+      <itemPath>include/relpipe/reader/RelpipeReaderException.h</itemPath>
       <itemPath>src/StringDataTypeReader.h</itemPath>
       <itemPath>src/format.h</itemPath>
-      <itemPath>include/typedefs.h</itemPath>
+      <itemPath>include/relpipe/reader/typedefs.h</itemPath>
     </logicalFolder>
     <logicalFolder name="ResourceFiles"
                    displayName="Resource Files"
@@ -46,13 +46,22 @@
       </toolsSet>
       <compileType>
       </compileType>
-      <item path="include/DataTypeReader.h" ex="false" tool="3" flavor2="0">
-      </item>
-      <item path="include/DataTypeReaderBase.h" ex="false" tool="3" flavor2="0">
+      <item path="include/relpipe/reader/DataTypeReader.h"
+            ex="false"
+            tool="3"
+            flavor2="0">
       </item>
-      <item path="include/RelpipeReaderException.h" ex="false" tool="3" flavor2="0">
+      <item path="include/relpipe/reader/DataTypeReaderBase.h"
+            ex="false"
+            tool="3"
+            flavor2="0">
       </item>
-      <item path="include/typedefs.h" ex="false" tool="3" flavor2="0">
+      <item path="include/relpipe/reader/RelpipeReaderException.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>
@@ -89,13 +98,22 @@
           <developmentMode>5</developmentMode>
         </asmTool>
       </compileType>
-      <item path="include/DataTypeReader.h" ex="false" tool="3" flavor2="0">
-      </item>
-      <item path="include/DataTypeReaderBase.h" ex="false" tool="3" flavor2="0">
+      <item path="include/relpipe/reader/DataTypeReader.h"
+            ex="false"
+            tool="3"
+            flavor2="0">
       </item>
-      <item path="include/RelpipeReaderException.h" ex="false" tool="3" flavor2="0">
+      <item path="include/relpipe/reader/DataTypeReaderBase.h"
+            ex="false"
+            tool="3"
+            flavor2="0">
       </item>
-      <item path="include/typedefs.h" ex="false" tool="3" flavor2="0">
+      <item path="include/relpipe/reader/RelpipeReaderException.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>