diff --git a/avr/devices/c01/0BUILD b/avr/devices/c01/0BUILD
index dc1bfd9..dc4c439 100644
--- a/avr/devices/c01/0BUILD
+++ b/avr/devices/c01/0BUILD
@@ -7,10 +7,6 @@
     main
   </subdirs>
 
-  <data dist="true" install="$(datadir)/aqhome/devices/nodes">
-    aqua_c01.xml
-  </data>
-
   <extradist>
     defs.asm
     README
diff --git a/avr/devices/c02/0BUILD b/avr/devices/c02/0BUILD
index ba8c739..dc4c439 100644
--- a/avr/devices/c02/0BUILD
+++ b/avr/devices/c02/0BUILD
@@ -7,10 +7,6 @@
     main
   </subdirs>
 
-  <data dist="true" install="$(datadir)/aqhome/devices/nodes">
-    aqua_c02.xml
-  </data>
-
   <extradist>
     defs.asm
     README
diff --git a/avr/devices/n14/0BUILD b/avr/devices/n14/0BUILD
index 58af77b..343465e 100644
--- a/avr/devices/n14/0BUILD
+++ b/avr/devices/n14/0BUILD
@@ -7,11 +7,6 @@
     main
   </subdirs>
 
-  <data dist="true" install="$(datadir)/aqhome/devices/nodes">
-    aqua_n14.xml
-  </data>
-
-
   <extradist>
     defs.asm
     eeprom.asm
diff --git a/avr/devices/n16/0BUILD b/avr/devices/n16/0BUILD
index e54b57e..be449f6 100644
--- a/avr/devices/n16/0BUILD
+++ b/avr/devices/n16/0BUILD
@@ -7,10 +7,6 @@
     main
   </subdirs>
 
-  <data dist="true" install="$(datadir)/aqhome/devices/nodes">
-    aqua_n16.xml
-  </data>
-
   <extradist>
     defs.asm
     README
diff --git a/avr/devices/n21/0BUILD b/avr/devices/n21/0BUILD
index 8416b5b..472c33c 100644
--- a/avr/devices/n21/0BUILD
+++ b/avr/devices/n21/0BUILD
@@ -12,10 +12,5 @@
     README
   </extradist>
 
-  <data dist="true" install="$(datadir)/aqhome/devices/nodes">
-    aqua_n21.xml
-  </data>
-
-
 </gwbuild>
 
diff --git a/avr/devices/n24/0BUILD b/avr/devices/n24/0BUILD
index 4ffa268..dc4c439 100644
--- a/avr/devices/n24/0BUILD
+++ b/avr/devices/n24/0BUILD
@@ -7,10 +7,6 @@
     main
   </subdirs>
 
-  <data dist="true" install="$(datadir)/aqhome/devices/nodes">
-    aqua_n24.xml
-  </data>
-  
   <extradist>
     defs.asm
     README
diff --git a/avr/devices/n25/0BUILD b/avr/devices/n25/0BUILD
index 7d93fbf..343465e 100644
--- a/avr/devices/n25/0BUILD
+++ b/avr/devices/n25/0BUILD
@@ -7,10 +7,6 @@
     main
   </subdirs>
 
-  <data dist="true" install="$(datadir)/aqhome/devices/nodes">
-    aqua_n25.xml
-  </data>
-
   <extradist>
     defs.asm
     eeprom.asm
diff --git a/avr/devices/n26/0BUILD b/avr/devices/n26/0BUILD
index 8736df4..dc4c439 100644
--- a/avr/devices/n26/0BUILD
+++ b/avr/devices/n26/0BUILD
@@ -7,10 +7,6 @@
     main
   </subdirs>
 
-  <data dist="true" install="$(datadir)/aqhome/devices/nodes">
-    aqua_n26.xml
-  </data>
-  
   <extradist>
     defs.asm
     README
diff --git a/avr/devices/n27/0BUILD b/avr/devices/n27/0BUILD
index 081044b..dc4c439 100644
--- a/avr/devices/n27/0BUILD
+++ b/avr/devices/n27/0BUILD
@@ -7,10 +7,6 @@
     main
   </subdirs>
 
-  <data dist="true" install="$(datadir)/aqhome/devices/nodes">
-    aqua_n27.xml
-  </data>
-  
   <extradist>
     defs.asm
     README
diff --git a/avr/devices/n28/0BUILD b/avr/devices/n28/0BUILD
index a2d9bae..472c33c 100644
--- a/avr/devices/n28/0BUILD
+++ b/avr/devices/n28/0BUILD
@@ -12,10 +12,5 @@
     README
   </extradist>
 
-  <data dist="true" install="$(datadir)/aqhome/devices/nodes">
-    aqua_n28.xml
-  </data>
-
-
 </gwbuild>
 
diff --git a/avr/devices/r05/0BUILD b/avr/devices/r05/0BUILD
index 9e83ec2..25ab0fb 100644
--- a/avr/devices/r05/0BUILD
+++ b/avr/devices/r05/0BUILD
@@ -13,11 +13,6 @@
     README
   </extradist>
 
-  <data dist="true" install="$(datadir)/aqhome/devices/nodes">
-    aqua_r05.xml
-  </data>
-  
-
 </gwbuild>
 
 
diff --git a/avr/devices/r06/0BUILD b/avr/devices/r06/0BUILD
index ef47309..dc4c439 100644
--- a/avr/devices/r06/0BUILD
+++ b/avr/devices/r06/0BUILD
@@ -7,10 +7,6 @@
     main
   </subdirs>
 
-  <data dist="true" install="$(datadir)/aqhome/devices/nodes">
-    aqua_r06.xml
-  </data>
-  
   <extradist>
     defs.asm
     README
diff --git a/avr/devices/s03/0BUILD b/avr/devices/s03/0BUILD
index 0829603..dc4c439 100644
--- a/avr/devices/s03/0BUILD
+++ b/avr/devices/s03/0BUILD
@@ -7,10 +7,6 @@
     main
   </subdirs>
 
-  <data dist="true" install="$(datadir)/aqhome/devices/nodes">
-    aqua_s03.xml
-  </data>
-
   <extradist>
     defs.asm
     README
diff --git a/avr/devices/t03/0BUILD b/avr/devices/t03/0BUILD
index ba832c8..c1b8f79 100644
--- a/avr/devices/t03/0BUILD
+++ b/avr/devices/t03/0BUILD
@@ -9,10 +9,6 @@
     uartfd
   </subdirs>
 
-  <data dist="true" install="$(datadir)/aqhome/devices/nodes">
-    aqua_t03.xml
-  </data>
-
   <extradist>
     defs.asm
     README
diff --git a/avr/devices/t04/0BUILD b/avr/devices/t04/0BUILD
index 2775440..dc4c439 100644
--- a/avr/devices/t04/0BUILD
+++ b/avr/devices/t04/0BUILD
@@ -7,10 +7,6 @@
     main
   </subdirs>
 
-  <data dist="true" install="$(datadir)/aqhome/devices/nodes">
-    aqua_t04.xml
-  </data>
-
   <extradist>
     defs.asm
     README
diff --git a/devices/nodes/0BUILD b/devices/nodes/0BUILD
index ed2e335..bf990a7 100644
--- a/devices/nodes/0BUILD
+++ b/devices/nodes/0BUILD
@@ -2,15 +2,30 @@
 
 <gwbuild>
   <data dist="true" install="$(datadir)/aqhome/devices/nodes">
+    aqua_c01.xml
+    aqua_c02.xml
     aqua_n06.xml
     aqua_n11.xml
     aqua_n12.xml
+    aqua_n14.xml
     aqua_n15.xml
+    aqua_n16.xml
     aqua_n17.xml
     aqua_n18.xml
     aqua_n19.xml
     aqua_n20.xml
+    aqua_n21.xml
     aqua_n22.xml
+    aqua_n24.xml
+    aqua_n25.xml
+    aqua_n26.xml
+    aqua_n27.xml
+    aqua_n28.xml
+    aqua_r05.xml
+    aqua_r06.xml
+    aqua_s03.xml
+    aqua_t03.xml
+    aqua_t04.xml
   </data>
 
 </gwbuild>
diff --git a/avr/devices/c01/aqua_c01.xml b/devices/nodes/aqua_c01.xml
similarity index 100%
rename from avr/devices/c01/aqua_c01.xml
rename to devices/nodes/aqua_c01.xml
diff --git a/avr/devices/c02/aqua_c02.xml b/devices/nodes/aqua_c02.xml
similarity index 100%
rename from avr/devices/c02/aqua_c02.xml
rename to devices/nodes/aqua_c02.xml
diff --git a/avr/devices/n14/aqua_n14.xml b/devices/nodes/aqua_n14.xml
similarity index 100%
rename from avr/devices/n14/aqua_n14.xml
rename to devices/nodes/aqua_n14.xml
diff --git a/avr/devices/n16/aqua_n16.xml b/devices/nodes/aqua_n16.xml
similarity index 100%
rename from avr/devices/n16/aqua_n16.xml
rename to devices/nodes/aqua_n16.xml
diff --git a/avr/devices/n21/aqua_n21.xml b/devices/nodes/aqua_n21.xml
similarity index 100%
rename from avr/devices/n21/aqua_n21.xml
rename to devices/nodes/aqua_n21.xml
diff --git a/avr/devices/n24/aqua_n24.xml b/devices/nodes/aqua_n24.xml
similarity index 100%
rename from avr/devices/n24/aqua_n24.xml
rename to devices/nodes/aqua_n24.xml
diff --git a/avr/devices/n25/aqua_n25.xml b/devices/nodes/aqua_n25.xml
similarity index 100%
rename from avr/devices/n25/aqua_n25.xml
rename to devices/nodes/aqua_n25.xml
diff --git a/avr/devices/n26/aqua_n26.xml b/devices/nodes/aqua_n26.xml
similarity index 100%
rename from avr/devices/n26/aqua_n26.xml
rename to devices/nodes/aqua_n26.xml
diff --git a/avr/devices/n27/aqua_n27.xml b/devices/nodes/aqua_n27.xml
similarity index 100%
rename from avr/devices/n27/aqua_n27.xml
rename to devices/nodes/aqua_n27.xml
diff --git a/avr/devices/n28/aqua_n28.xml b/devices/nodes/aqua_n28.xml
similarity index 100%
rename from avr/devices/n28/aqua_n28.xml
rename to devices/nodes/aqua_n28.xml
diff --git a/avr/devices/r05/aqua_r05.xml b/devices/nodes/aqua_r05.xml
similarity index 100%
rename from avr/devices/r05/aqua_r05.xml
rename to devices/nodes/aqua_r05.xml
diff --git a/avr/devices/r06/aqua_r06.xml b/devices/nodes/aqua_r06.xml
similarity index 100%
rename from avr/devices/r06/aqua_r06.xml
rename to devices/nodes/aqua_r06.xml
diff --git a/avr/devices/s03/aqua_s03.xml b/devices/nodes/aqua_s03.xml
similarity index 100%
rename from avr/devices/s03/aqua_s03.xml
rename to devices/nodes/aqua_s03.xml
diff --git a/avr/devices/t03/aqua_t03.xml b/devices/nodes/aqua_t03.xml
similarity index 100%
rename from avr/devices/t03/aqua_t03.xml
rename to devices/nodes/aqua_t03.xml
diff --git a/avr/devices/t04/aqua_t04.xml b/devices/nodes/aqua_t04.xml
similarity index 100%
rename from avr/devices/t04/aqua_t04.xml
rename to devices/nodes/aqua_t04.xml