diff --git a/aqhome/data/0BUILD b/aqhome/data/0BUILD
index 9769501..f6e7585 100644
--- a/aqhome/data/0BUILD
+++ b/aqhome/data/0BUILD
@@ -57,7 +57,6 @@
   
     <headers dist="true" install="$(pkgincludedir)/data" >
       storage.h
-      datafile_direct.h
     </headers>
 
 
@@ -65,7 +64,6 @@
       storage_p.h
       storage_readxml.h
       storage_writexml.h
-      datafile_direct_p.h
       vars.h
       vars_p.h
       vars_dbread.h
@@ -80,7 +78,6 @@
       storage.c
       storage_readxml.c
       storage_writexml.c
-      datafile_direct.c
       vars.c
       vars_dbread.c
       vars_dbwrite.c
@@ -101,9 +98,11 @@
 
 
     <useTargets>
+      aqhdf
     </useTargets>
 
     <subdirs>
+      datafile
     </subdirs>
 
   
diff --git a/aqhome/data/datafile/0BUILD b/aqhome/data/datafile/0BUILD
new file mode 100644
index 0000000..6a7b784
--- /dev/null
+++ b/aqhome/data/datafile/0BUILD
@@ -0,0 +1,79 @@
+<?xml?>
+
+<gwbuild>
+
+  <target type="ConvenienceLibrary" name="aqhdf" >
+
+    <includes type="c" >
+      $(gwenhywfar_cflags)
+      -I$(topsrcdir)
+      -I$(topbuilddir)
+    </includes>
+  
+    <includes type="tm2" >
+      --include=$(builddir)
+      --include=$(srcdir)
+    </includes>
+
+
+    <define name="BUILDING_AQHOME" />
+
+    <setVar name="local/cflags">$(visibility_cflags)</setVar>
+
+  
+    <setVar name="tm2flags" >
+      --api=AQHOME_API
+    </setVar>
+
+    <setVar name="local/typefiles" >
+    </setVar>
+  
+    <setVar name="local/built_sources" >
+    </setVar>
+  
+    <setVar name="local/built_headers_pub">
+    </setVar>
+  
+  
+    <setVar name="local/built_headers_priv" >
+    </setVar>
+
+
+    <headers dist="false" install="$(pkgincludedir)/nodes" >
+      $(local/built_headers_pub)
+    </headers>
+  
+  
+    <headers dist="true" install="$(pkgincludedir)/nodes" >
+    </headers>
+
+
+    <headers dist="true" >
+    </headers>
+  
+  
+    <sources>
+      $(local/typefiles)
+      dummy.c
+    </sources>
+
+
+    <extradist>
+    </extradist>
+
+
+    <useTargets>
+      aqhdf_direct
+    </useTargets>
+
+    <subdirs>
+      df_direct
+    </subdirs>
+
+  
+  
+
+  </target>
+
+  
+</gwbuild>
diff --git a/aqhome/data/datafile/df_direct/0BUILD b/aqhome/data/datafile/df_direct/0BUILD
new file mode 100644
index 0000000..5c08e3f
--- /dev/null
+++ b/aqhome/data/datafile/df_direct/0BUILD
@@ -0,0 +1,78 @@
+<?xml?>
+
+<gwbuild>
+
+  <target type="ConvenienceLibrary" name="aqhdf_direct" >
+
+    <includes type="c" >
+      $(gwenhywfar_cflags)
+      -I$(topsrcdir)
+      -I$(topbuilddir)
+    </includes>
+  
+    <includes type="tm2" >
+      --include=$(builddir)
+      --include=$(srcdir)
+    </includes>
+
+
+    <define name="BUILDING_AQHOME" />
+
+    <setVar name="local/cflags">$(visibility_cflags)</setVar>
+
+  
+    <setVar name="tm2flags" >
+      --api=AQHOME_API
+    </setVar>
+
+    <setVar name="local/typefiles" >
+    </setVar>
+  
+    <setVar name="local/built_sources" >
+    </setVar>
+  
+    <setVar name="local/built_headers_pub">
+    </setVar>
+  
+  
+    <setVar name="local/built_headers_priv" >
+    </setVar>
+
+
+    <headers dist="false" install="$(pkgincludedir)/nodes" >
+      $(local/built_headers_pub)
+    </headers>
+  
+  
+    <headers dist="true" install="$(pkgincludedir)/nodes" >
+    </headers>
+
+
+    <headers dist="true" >
+      df_direct.h
+    </headers>
+  
+  
+    <sources>
+      $(local/typefiles)
+      df_direct.c
+    </sources>
+
+
+    <extradist>
+    </extradist>
+
+
+    <useTargets>
+    </useTargets>
+
+    <subdirs>
+    </subdirs>
+
+  
+  
+
+  </target>
+
+  
+</gwbuild>
diff --git a/aqhome/data/datafile_direct.c b/aqhome/data/datafile/df_direct/df_direct.c
similarity index 99%
rename from aqhome/data/datafile_direct.c
rename to aqhome/data/datafile/df_direct/df_direct.c
index b066c74..27bc70b 100644
--- a/aqhome/data/datafile_direct.c
+++ b/aqhome/data/datafile/df_direct/df_direct.c
@@ -10,7 +10,7 @@
 # include <config.h>
 #endif
 
-#include "./datafile_direct_p.h"
+#include "./df_direct_p.h"
 
 #include <gwenhywfar/debug.h>
 #include <gwenhywfar/syncio_file.h>
diff --git a/aqhome/data/datafile_direct.h b/aqhome/data/datafile/df_direct/df_direct.h
similarity index 93%
rename from aqhome/data/datafile_direct.h
rename to aqhome/data/datafile/df_direct/df_direct.h
index ecf4aaa..f2864ae 100644
--- a/aqhome/data/datafile_direct.h
+++ b/aqhome/data/datafile/df_direct/df_direct.h
@@ -6,8 +6,8 @@
  * should have received along with this file.
  ****************************************************************************/
 
-#ifndef AQH_DATAFILE_H
-#define AQH_DATAFILE_H
+#ifndef AQH_DF_DIRECT_H
+#define AQH_DF_DIRECT_H
 
 
 #include "aqhome/data/storage.h"
diff --git a/aqhome/data/datafile_direct_p.h b/aqhome/data/datafile/df_direct/df_direct_p.h
similarity index 88%
rename from aqhome/data/datafile_direct_p.h
rename to aqhome/data/datafile/df_direct/df_direct_p.h
index 903ec4b..0d007d3 100644
--- a/aqhome/data/datafile_direct_p.h
+++ b/aqhome/data/datafile/df_direct/df_direct_p.h
@@ -6,11 +6,11 @@
  * should have received along with this file.
  ****************************************************************************/
 
-#ifndef AQH_DATAFILE_DIRECT_P_H
-#define AQH_DATAFILE_DIRECT_P_H
+#ifndef AQH_DF_DIRECT_P_H
+#define AQH_DF_DIRECT_P_H
 
 
-#include "./datafile_direct.h"
+#include "./df_direct.h"
 
 #include <gwenhywfar/syncio.h>
 
diff --git a/aqhome/data/datafile/dummy.c b/aqhome/data/datafile/dummy.c
new file mode 100644
index 0000000..e69de29
diff --git a/aqhome/data/storage.c b/aqhome/data/storage.c
index 0fc1851..74a8a65 100644
--- a/aqhome/data/storage.c
+++ b/aqhome/data/storage.c
@@ -13,7 +13,7 @@
 #include "aqhome/data/storage_p.h"
 #include "aqhome/data/storage_readxml.h"
 #include "aqhome/data/storage_writexml.h"
-#include "aqhome/data/datafile_direct.h"
+#include "aqhome/data/datafile/df_direct/df_direct.h"
 
 #include <gwenhywfar/debug.h>
 #include <gwenhywfar/xml.h>