diff --git a/avr/att84_base.asm b/avr/att84_base.asm
index 6e5ff05..34ae2b9 100644
--- a/avr/att84_base.asm
+++ b/avr/att84_base.asm
@@ -38,9 +38,9 @@
 .equ clock=1000000 ; Define the clock frequency
 
 
-.include "utils_wait.asm"
-.include "com2_defs.asm"
-.include "comproto_defs.asm"
+.include "common/utils_wait.asm"
+.include "modules/com2/com2_defs.asm"
+.include "modules/comproto/comproto_defs.asm"
 
 
 
@@ -159,13 +159,12 @@ main:
 ; ***************************************************************************
 ; includes
 
-.include "com2_lowlevel.asm"
-.include "com2_crc.asm"
-.include "com2_packets.asm"
-.include "crc8.asm"
-.include "flash.asm"
-.include "flashproto.asm"
-.include "watchdog.asm"
+.include "modules/com2/com2_lowlevel.asm"
+.include "modules/com2/com2_crc.asm"
+.include "modules/com2/com2_packets.asm"
+.include "common/crc8.asm"
+.include "modules/flash/flash.asm"
+.include "modules/flash/flashproto.asm"
 
 
 
diff --git a/avr/att84_temp1.asm b/avr/att84_temp1.asm
index dd983f9..b5802de 100644
--- a/avr/att84_temp1.asm
+++ b/avr/att84_temp1.asm
@@ -49,6 +49,7 @@
 
 .equ clock=1000000 ; Define the clock frequency
 
+.include "common/utils_wait.asm"
 
 
 ; ---------------------------------------------------------------------------
@@ -203,42 +204,43 @@ firmwareStart:   rjmp main
 ; ***************************************************************************
 ; includes
 
-.include "utils.asm"
-.include "crc8.asm"
-.include "watchdog.asm"
+.include "common/utils.asm"
+.include "common/crc8.asm"
 
 #ifdef MODULES_TIMER
-  .include "timer.asm"
+  .include "modules/timer/timer.asm"
 #endif
 #ifdef MODULES_LED
-.include "led.asm"
+.include "modules/led/led.asm"
 #endif
 #ifdef MODULES_COM
-  .include "com2.asm"
+  .include "modules/com2/com2_defs.asm"
+  .include "modules/com2/com2.asm"
   #ifdef MODULES_COM_WITH_ADDR_PROTO
-    .include "comproto.asm"
-    .include "comproto_addr.asm"
-    .include "comproto_recvstats.asm"
-    .include "comproto_sendstats.asm"
-    .include "comproto_sysstats.asm"
-    .include "comproto_memstats.asm"
-    .include "comproto_pong.asm"
-    .include "comproto_values.asm"
-    .include "comproto_device.asm"
-    .include "comproto_reboot.asm"
+    .include "modules/comproto/comproto_defs.asm"
+    .include "modules/comproto/comproto.asm"
+    .include "modules/comproto/comproto_addr.asm"
+    .include "modules/comproto/comproto_recvstats.asm"
+    .include "modules/comproto/comproto_sendstats.asm"
+    .include "modules/comproto/comproto_sysstats.asm"
+    .include "modules/comproto/comproto_memstats.asm"
+    .include "modules/comproto/comproto_pong.asm"
+    .include "modules/comproto/comproto_values.asm"
+    .include "modules/comproto/comproto_device.asm"
+    .include "modules/comproto/comproto_reboot.asm"
   #endif
 #endif
 #ifdef MODULES_TWI_MASTER
-  .include "twimaster.asm"
+  .include "modules/twimaster/twimaster.asm"
 #endif
 #ifdef MODULES_LCD
-  .include "lcd.asm"
+  .include "modules/lcd/lcd.asm"
 #endif
 #ifdef MODULES_SI7021
-  .include "si7021.asm"
+  .include "modules/si7021/si7021.asm"
 #endif
 #ifdef MODULES_STATS
-  .include "stats.asm"
+  .include "modules/stats/stats.asm"
 #endif
 
 
diff --git a/avr/crc8.asm b/avr/common/crc8.asm
similarity index 100%
rename from avr/crc8.asm
rename to avr/common/crc8.asm
diff --git a/avr/ringbuffer.asm b/avr/common/ringbuffer.asm
similarity index 100%
rename from avr/ringbuffer.asm
rename to avr/common/ringbuffer.asm
diff --git a/avr/shared.asm b/avr/common/shared.asm
similarity index 100%
rename from avr/shared.asm
rename to avr/common/shared.asm
diff --git a/avr/utils.asm b/avr/common/utils.asm
similarity index 99%
rename from avr/utils.asm
rename to avr/common/utils.asm
index a99d20f..012f3e0 100644
--- a/avr/utils.asm
+++ b/avr/common/utils.asm
@@ -11,14 +11,6 @@
 
 
 
-; ***************************************************************************
-; macros
-
-.include "utils_wait.asm"
-
-
-
-
 ; ***************************************************************************
 ; data
 
diff --git a/avr/utils_wait.asm b/avr/common/utils_wait.asm
similarity index 100%
rename from avr/utils_wait.asm
rename to avr/common/utils_wait.asm
diff --git a/avr/watchdog.asm b/avr/common/watchdog.asm
similarity index 100%
rename from avr/watchdog.asm
rename to avr/common/watchdog.asm
diff --git a/avr/main.asm b/avr/main.asm
index 2de9df6..506c6d8 100644
--- a/avr/main.asm
+++ b/avr/main.asm
@@ -41,7 +41,7 @@ main:
   ldi r16, Low(RAMEND)
   out SPL, r16             ; init LSB stack pointer
 
-  rcall watchdogOff        ; turn off watchdog timer (sometimes it stays on after reboot)
+;  rcall watchdogOff        ; turn off watchdog timer (sometimes it stays on after reboot)
   
   rcall initModules
 
diff --git a/avr/bmp280.asm b/avr/modules/bmp280/bmp280.asm
similarity index 100%
rename from avr/bmp280.asm
rename to avr/modules/bmp280/bmp280.asm
diff --git a/avr/com2.asm b/avr/modules/com2/com2.asm
similarity index 98%
rename from avr/com2.asm
rename to avr/modules/com2/com2.asm
index f80db51..a872f0e 100644
--- a/avr/com2.asm
+++ b/avr/modules/com2/com2.asm
@@ -9,14 +9,6 @@
 
 
 
-; ***************************************************************************
-; defines
-
-.include "com2_defs.asm"
-
-
-
-
 ; ***************************************************************************
 ; data
 
@@ -428,10 +420,10 @@ com2IsrPcint0_end:
 
 
 
-.include "com2_packets.asm"
-.include "com2_lowlevel.asm"
-.include "com2_buffer.asm"
-.include "com2_crc.asm"
+.include "modules/com2/com2_packets.asm"
+.include "modules/com2/com2_lowlevel.asm"
+.include "modules/com2/com2_buffer.asm"
+.include "modules/com2/com2_crc.asm"
 
 
 
diff --git a/avr/com2_buffer.asm b/avr/modules/com2/com2_buffer.asm
similarity index 100%
rename from avr/com2_buffer.asm
rename to avr/modules/com2/com2_buffer.asm
diff --git a/avr/com2_crc.asm b/avr/modules/com2/com2_crc.asm
similarity index 100%
rename from avr/com2_crc.asm
rename to avr/modules/com2/com2_crc.asm
diff --git a/avr/com2_defs.asm b/avr/modules/com2/com2_defs.asm
similarity index 100%
rename from avr/com2_defs.asm
rename to avr/modules/com2/com2_defs.asm
diff --git a/avr/com2_lowlevel.asm b/avr/modules/com2/com2_lowlevel.asm
similarity index 100%
rename from avr/com2_lowlevel.asm
rename to avr/modules/com2/com2_lowlevel.asm
diff --git a/avr/com2_packets.asm b/avr/modules/com2/com2_packets.asm
similarity index 100%
rename from avr/com2_packets.asm
rename to avr/modules/com2/com2_packets.asm
diff --git a/avr/comproto.asm b/avr/modules/comproto/comproto.asm
similarity index 95%
rename from avr/comproto.asm
rename to avr/modules/comproto/comproto.asm
index bf4de70..07fbc9e 100644
--- a/avr/comproto.asm
+++ b/avr/modules/comproto/comproto.asm
@@ -12,13 +12,6 @@
 
 
 
-; ***************************************************************************
-; defines
-
-.include "comproto_defs.asm"
-
-
-
 ; ***************************************************************************
 ; data
 
diff --git a/avr/comproto_addr.asm b/avr/modules/comproto/comproto_addr.asm
similarity index 99%
rename from avr/comproto_addr.asm
rename to avr/modules/comproto/comproto_addr.asm
index f879bb8..2039df1 100644
--- a/avr/comproto_addr.asm
+++ b/avr/modules/comproto/comproto_addr.asm
@@ -425,8 +425,8 @@ cproSendAddressPacket:
 
 
 
-.include "comproto_addr1.asm"
-.include "comproto_addr2.asm"
+.include "modules/comproto/comproto_addr1.asm"
+.include "modules/comproto/comproto_addr2.asm"
 
 
 #endif ; MODULES_COM_WITH_ADDR_PROTO
diff --git a/avr/comproto_addr1.asm b/avr/modules/comproto/comproto_addr1.asm
similarity index 100%
rename from avr/comproto_addr1.asm
rename to avr/modules/comproto/comproto_addr1.asm
diff --git a/avr/comproto_addr2.asm b/avr/modules/comproto/comproto_addr2.asm
similarity index 100%
rename from avr/comproto_addr2.asm
rename to avr/modules/comproto/comproto_addr2.asm
diff --git a/avr/comproto_debug.asm b/avr/modules/comproto/comproto_debug.asm
similarity index 100%
rename from avr/comproto_debug.asm
rename to avr/modules/comproto/comproto_debug.asm
diff --git a/avr/comproto_defs.asm b/avr/modules/comproto/comproto_defs.asm
similarity index 100%
rename from avr/comproto_defs.asm
rename to avr/modules/comproto/comproto_defs.asm
diff --git a/avr/comproto_device.asm b/avr/modules/comproto/comproto_device.asm
similarity index 100%
rename from avr/comproto_device.asm
rename to avr/modules/comproto/comproto_device.asm
diff --git a/avr/comproto_memstats.asm b/avr/modules/comproto/comproto_memstats.asm
similarity index 100%
rename from avr/comproto_memstats.asm
rename to avr/modules/comproto/comproto_memstats.asm
diff --git a/avr/comproto_ping.asm b/avr/modules/comproto/comproto_ping.asm
similarity index 100%
rename from avr/comproto_ping.asm
rename to avr/modules/comproto/comproto_ping.asm
diff --git a/avr/comproto_pong.asm b/avr/modules/comproto/comproto_pong.asm
similarity index 100%
rename from avr/comproto_pong.asm
rename to avr/modules/comproto/comproto_pong.asm
diff --git a/avr/comproto_reboot.asm b/avr/modules/comproto/comproto_reboot.asm
similarity index 100%
rename from avr/comproto_reboot.asm
rename to avr/modules/comproto/comproto_reboot.asm
diff --git a/avr/comproto_recvstats.asm b/avr/modules/comproto/comproto_recvstats.asm
similarity index 100%
rename from avr/comproto_recvstats.asm
rename to avr/modules/comproto/comproto_recvstats.asm
diff --git a/avr/comproto_sendstats.asm b/avr/modules/comproto/comproto_sendstats.asm
similarity index 100%
rename from avr/comproto_sendstats.asm
rename to avr/modules/comproto/comproto_sendstats.asm
diff --git a/avr/comproto_sysstats.asm b/avr/modules/comproto/comproto_sysstats.asm
similarity index 100%
rename from avr/comproto_sysstats.asm
rename to avr/modules/comproto/comproto_sysstats.asm
diff --git a/avr/comproto_twi.asm b/avr/modules/comproto/comproto_twi.asm
similarity index 100%
rename from avr/comproto_twi.asm
rename to avr/modules/comproto/comproto_twi.asm
diff --git a/avr/comproto_values.asm b/avr/modules/comproto/comproto_values.asm
similarity index 100%
rename from avr/comproto_values.asm
rename to avr/modules/comproto/comproto_values.asm
diff --git a/avr/flash.asm b/avr/modules/flash/flash.asm
similarity index 100%
rename from avr/flash.asm
rename to avr/modules/flash/flash.asm
diff --git a/avr/flashproto.asm b/avr/modules/flash/flashproto.asm
similarity index 100%
rename from avr/flashproto.asm
rename to avr/modules/flash/flashproto.asm
diff --git a/avr/lcd.asm b/avr/modules/lcd/lcd.asm
similarity index 100%
rename from avr/lcd.asm
rename to avr/modules/lcd/lcd.asm
diff --git a/avr/led.asm b/avr/modules/led/led.asm
similarity index 100%
rename from avr/led.asm
rename to avr/modules/led/led.asm
diff --git a/avr/si7021.asm b/avr/modules/si7021/si7021.asm
similarity index 100%
rename from avr/si7021.asm
rename to avr/modules/si7021/si7021.asm
diff --git a/avr/stats.asm b/avr/modules/stats/stats.asm
similarity index 100%
rename from avr/stats.asm
rename to avr/modules/stats/stats.asm
diff --git a/avr/timer.asm b/avr/modules/timer/timer.asm
similarity index 100%
rename from avr/timer.asm
rename to avr/modules/timer/timer.asm
diff --git a/avr/twimaster.asm b/avr/modules/twimaster/twimaster.asm
similarity index 100%
rename from avr/twimaster.asm
rename to avr/modules/twimaster/twimaster.asm