diff --git a/avr/0BUILD b/avr/0BUILD
index fa815ca..4e3c1ed 100644
--- a/avr/0BUILD
+++ b/avr/0BUILD
@@ -56,6 +56,12 @@
   </target>
 
 
+  <subdirs>
+    common
+    include
+    modules
+  </subdirs>
+  
 
 </gwbuild>
 
diff --git a/avr/common/0BUILD b/avr/common/0BUILD
new file mode 100644
index 0000000..87f2b64
--- /dev/null
+++ b/avr/common/0BUILD
@@ -0,0 +1,16 @@
+<?xml?>
+
+<gwbuild>
+
+  <extradist>
+    crc8.asm
+    ringbuffer.asm
+    shared.asm
+    utils.asm
+    utils_wait.asm
+    watchdog.asm
+  </extradist>
+
+</gwbuild>
+
+
diff --git a/avr/include/0BUILD b/avr/include/0BUILD
new file mode 100644
index 0000000..8da49cc
--- /dev/null
+++ b/avr/include/0BUILD
@@ -0,0 +1,200 @@
+<?xml?>
+
+<gwbuild>
+
+  <extradist>
+    1200def.inc
+    2313def.inc
+    2323def.inc
+    2343def.inc
+    4414def.inc
+    4433def.inc
+    4434def.inc
+    8515def.inc
+    8535def.inc
+    AT86RF401def.inc
+    ATA6289def.inc
+    ATxmega128A1def.inc
+    ATxmega128A3def.inc
+    ATxmega128A3Udef.inc
+    ATxmega128D3def.inc
+    ATxmega16A4def.inc
+    ATxmega16A4Udef.inc
+    ATxmega16D4def.inc
+    ATxmega192A3def.inc
+    ATxmega192A3Udef.inc
+    ATxmega192D3def.inc
+    ATxmega256A3Bdef.inc
+    ATxmega256A3def.inc
+    ATxmega256A3Udef.inc
+    ATxmega256D3def.inc
+    ATxmega32A4def.inc
+    ATxmega32A4Udef.inc
+    ATxmega32D4def.inc
+    ATxmega384C3def.inc
+    ATxmega64A1def.inc
+    ATxmega64A3def.inc
+    ATxmega64A3Udef.inc
+    ATxmega64D3def.inc
+    can128def.inc
+    can32def.inc
+    can64def.inc
+    m103def.inc
+    m1280def.inc
+    m1281def.inc
+    m1284def.inc
+    m1284Pdef.inc
+    m128Adef.inc
+    m128def.inc
+    m128RFA1def.inc
+    m161def.inc
+    m162def.inc
+    m163def.inc
+    m164Adef.inc
+    m164PAdef.inc
+    m164Pdef.inc
+    m165Adef.inc
+    m165def.inc
+    m165PAdef.inc
+    m165Pdef.inc
+    m168Adef.inc
+    m168def.inc
+    m168PAdef.inc
+    m168Pdef.inc
+    m169Adef.inc
+    m169def.inc
+    m169PAdef.inc
+    m169Pdef.inc
+    m16Adef.inc
+    m16def.inc
+    m16HVA2def.inc
+    m16HVAdef.inc
+    m16HVBdef.inc
+    m16M1def.inc
+    m16U2def.inc
+    m16U4def.inc
+    m2560def.inc
+    m2561def.inc
+    m323def.inc
+    m324Adef.inc
+    m324PAdef.inc
+    m324Pdef.inc
+    m3250Adef.inc
+    m3250def.inc
+    m3250PAdef.inc
+    m3250Pdef.inc
+    m325Adef.inc
+    m325def.inc
+    m325PAdef.inc
+    m325Pdef.inc
+    m328def.inc
+    m328Pdef.inc
+    m3290Adef.inc
+    m3290def.inc
+    m3290PAdef.inc
+    m3290Pdef.inc
+    m329Adef.inc
+    m329def.inc
+    m329PAdef.inc
+    m329Pdef.inc
+    m32Adef.inc
+    m32C1def.inc
+    m32def.inc
+    m32HVBdef.inc
+    m32M1def.inc
+    m32U2def.inc
+    m32U4def.inc
+    m32U6def.inc
+    m406def.inc
+    m48Adef.inc
+    m48def.inc
+    m48PAdef.inc
+    m48Pdef.inc
+    m640def.inc
+    m644Adef.inc
+    m644def.inc
+    m644PAdef.inc
+    m644Pdef.inc
+    m6450Adef.inc
+    m6450def.inc
+    m6450Pdef.inc
+    m645Adef.inc
+    m645def.inc
+    m645Pdef.inc
+    m6490Adef.inc
+    m6490def.inc
+    m6490Pdef.inc
+    m649Adef.inc
+    m649def.inc
+    m649Pdef.inc
+    m64Adef.inc
+    m64C1def.inc
+    m64def.inc
+    m64HVEdef.inc
+    m64M1def.inc
+    m8515def.inc
+    m8535def.inc
+    m88Adef.inc
+    m88def.inc
+    m88PAdef.inc
+    m88Pdef.inc
+    m8Adef.inc
+    m8def.inc
+    m8HVAdef.inc
+    m8U2def.inc
+    pwm1def.inc
+    pwm216def.inc
+    pwm2Bdef.inc
+    pwm2def.inc
+    pwm316def.inc
+    pwm3Bdef.inc
+    pwm3def.inc
+    pwm81def.inc
+    tn10def.inc
+    tn11def.inc
+    tn12def.inc
+    tn13Adef.inc
+    tn13def.inc
+    tn15def.inc
+    tn1634def.inc
+    tn167def.inc
+    tn20def.inc
+    tn22def.inc
+    tn2313Adef.inc
+    tn2313def.inc
+    tn24Adef.inc
+    tn24def.inc
+    tn25def.inc
+    tn261Adef.inc
+    tn261def.inc
+    tn26def.inc
+    tn28def.inc
+    tn40def.inc
+    tn4313def.inc
+    tn43Udef.inc
+    tn44Adef.inc
+    tn44def.inc
+    tn45def.inc
+    tn461Adef.inc
+    tn461def.inc
+    tn48def.inc
+    tn4def.inc
+    tn5def.inc
+    tn84Adef.inc
+    tn84def.inc
+    tn85def.inc
+    tn861Adef.inc
+    tn861def.inc
+    tn87def.inc
+    tn88def.inc
+    tn9def.inc
+    usb1286def.inc
+    usb1287def.inc
+    usb162def.inc
+    usb646def.inc
+    usb647def.inc
+    usb82def.inc
+  </extradist>
+
+</gwbuild>
+
diff --git a/avr/modules/0BUILD b/avr/modules/0BUILD
new file mode 100644
index 0000000..39f266f
--- /dev/null
+++ b/avr/modules/0BUILD
@@ -0,0 +1,19 @@
+<?xml?>
+
+<gwbuild>
+
+  <subdirs>
+    bmp280
+    com2
+    comproto
+    flash
+    lcd
+    led
+    si7021
+    stats
+    timer
+    twimaster
+  </subdirs>
+
+</gwbuild>
+
diff --git a/avr/modules/bmp280/0BUILD b/avr/modules/bmp280/0BUILD
new file mode 100644
index 0000000..cd3e43a
--- /dev/null
+++ b/avr/modules/bmp280/0BUILD
@@ -0,0 +1,11 @@
+<?xml?>
+
+<gwbuild>
+
+  <extradist>
+    bmp280.asm
+  </extradist>
+
+</gwbuild>
+
+
diff --git a/avr/modules/com2/0BUILD b/avr/modules/com2/0BUILD
new file mode 100644
index 0000000..8c47a42
--- /dev/null
+++ b/avr/modules/com2/0BUILD
@@ -0,0 +1,16 @@
+<?xml?>
+
+<gwbuild>
+
+  <extradist>
+    buffer.asm
+    crc.asm
+    defs.asm
+    lowlevel.asm
+    main.asm
+    packets.asm
+  </extradist>
+
+</gwbuild>
+
+
diff --git a/avr/modules/comproto/0BUILD b/avr/modules/comproto/0BUILD
new file mode 100644
index 0000000..7de15bc
--- /dev/null
+++ b/avr/modules/comproto/0BUILD
@@ -0,0 +1,27 @@
+<?xml?>
+
+<gwbuild>
+
+  <extradist>
+    addr.asm
+    addr1.asm
+    addr2.asm
+    defs.asm
+    main.asm
+    msg_debug.asm
+    msg_device.asm
+    msg_memstats.asm
+    msg_ping.asm
+    msg_pong.asm
+    msg_reboot.asm
+    msg_recvstats.asm
+    msg_sendstats.asm
+    msg_sysstats.asm
+    msg_twi.asm
+    msg_value.asm
+  </extradist>
+
+
+</gwbuild>
+
+
diff --git a/avr/modules/flash/0BUILD b/avr/modules/flash/0BUILD
new file mode 100644
index 0000000..37e07bc
--- /dev/null
+++ b/avr/modules/flash/0BUILD
@@ -0,0 +1,19 @@
+<?xml?>
+
+<gwbuild>
+
+  <extradist>
+    bootloader.asm
+    flash.asm
+    flash_ready.asm
+    flash_rsp.asm
+    hdl_flash_data.asm
+    hdl_flash_end.asm
+    hdl_flash_start.asm
+    recv.asm
+    send.asm
+    wait.asm
+  </extradist>
+
+</gwbuild>
+
diff --git a/avr/modules/lcd/0BUILD b/avr/modules/lcd/0BUILD
new file mode 100644
index 0000000..febd367
--- /dev/null
+++ b/avr/modules/lcd/0BUILD
@@ -0,0 +1,11 @@
+<?xml?>
+
+<gwbuild>
+
+  <extradist>
+    main.asm
+  </extradist>
+
+</gwbuild>
+
+
diff --git a/avr/modules/led/0BUILD b/avr/modules/led/0BUILD
new file mode 100644
index 0000000..febd367
--- /dev/null
+++ b/avr/modules/led/0BUILD
@@ -0,0 +1,11 @@
+<?xml?>
+
+<gwbuild>
+
+  <extradist>
+    main.asm
+  </extradist>
+
+</gwbuild>
+
+
diff --git a/avr/modules/si7021/0BUILD b/avr/modules/si7021/0BUILD
new file mode 100644
index 0000000..febd367
--- /dev/null
+++ b/avr/modules/si7021/0BUILD
@@ -0,0 +1,11 @@
+<?xml?>
+
+<gwbuild>
+
+  <extradist>
+    main.asm
+  </extradist>
+
+</gwbuild>
+
+
diff --git a/avr/modules/stats/0BUILD b/avr/modules/stats/0BUILD
new file mode 100644
index 0000000..febd367
--- /dev/null
+++ b/avr/modules/stats/0BUILD
@@ -0,0 +1,11 @@
+<?xml?>
+
+<gwbuild>
+
+  <extradist>
+    main.asm
+  </extradist>
+
+</gwbuild>
+
+
diff --git a/avr/modules/timer/0BUILD b/avr/modules/timer/0BUILD
new file mode 100644
index 0000000..8038787
--- /dev/null
+++ b/avr/modules/timer/0BUILD
@@ -0,0 +1,12 @@
+<?xml?>
+
+<gwbuild>
+
+  <extradist>
+    main.asm
+  </extradist>
+
+</gwbuild>
+
+
+
diff --git a/avr/modules/twimaster/0BUILD b/avr/modules/twimaster/0BUILD
new file mode 100644
index 0000000..febd367
--- /dev/null
+++ b/avr/modules/twimaster/0BUILD
@@ -0,0 +1,11 @@
+<?xml?>
+
+<gwbuild>
+
+  <extradist>
+    main.asm
+  </extradist>
+
+</gwbuild>
+
+