diff --git a/apps/aqhome-mqttlog/xmlread.c b/apps/aqhome-mqttlog/xmlread.c
index de121d0..97ded7a 100644
--- a/apps/aqhome-mqttlog/xmlread.c
+++ b/apps/aqhome-mqttlog/xmlread.c
@@ -94,7 +94,7 @@ AQHMQTT_DEVICE_LIST *AqHomeMqttLog_ReadDataDeviceFiles(AQHOME_MQTT *aqh)
 {
   GWEN_STRINGLIST *sl;
 
-  sl=AQH_GetListOfMatchingDataFiles("aqhome/devices", "*.xml");
+  sl=AQH_GetListOfMatchingDataFiles("aqhome/devices/mqtt", "*.xml");
   if (sl) {
     AQHMQTT_DEVICE_LIST *deviceList;
 
diff --git a/devices/0BUILD b/devices/0BUILD
index 569826d..130ecec 100644
--- a/devices/0BUILD
+++ b/devices/0BUILD
@@ -1,8 +1,9 @@
 <?xml?>
 
 <gwbuild>
-  <data dist="true" install="$(datadir)/aqhome/devices">
-    tasmota_plug.xml
-  </data>
+
+  <subdirs>
+    mqtt
+  </subdirs>
 
 </gwbuild>
diff --git a/devices/mqtt/0BUILD b/devices/mqtt/0BUILD
new file mode 100644
index 0000000..92097ab
--- /dev/null
+++ b/devices/mqtt/0BUILD
@@ -0,0 +1,8 @@
+<?xml?>
+
+<gwbuild>
+  <data dist="true" install="$(datadir)/aqhome/devices/mqtt">
+    tasmota_plug.xml
+  </data>
+
+</gwbuild>
diff --git a/devices/tasmota_plug.xml b/devices/mqtt/tasmota_plug.xml
similarity index 100%
rename from devices/tasmota_plug.xml
rename to devices/mqtt/tasmota_plug.xml