diff --git a/os/hal/ports/AVR/avr_pins.h b/os/hal/ports/AVR/MEGA/avr_pins.h
similarity index 100%
rename from os/hal/ports/AVR/avr_pins.h
rename to os/hal/ports/AVR/MEGA/avr_pins.h
diff --git a/os/hal/ports/AVR/avr_timers.h b/os/hal/ports/AVR/MEGA/avr_timers.h
similarity index 100%
rename from os/hal/ports/AVR/avr_timers.h
rename to os/hal/ports/AVR/MEGA/avr_timers.h
diff --git a/os/hal/ports/AVR/hal_adc_lld.c b/os/hal/ports/AVR/MEGA/hal_adc_lld.c
similarity index 100%
rename from os/hal/ports/AVR/hal_adc_lld.c
rename to os/hal/ports/AVR/MEGA/hal_adc_lld.c
diff --git a/os/hal/ports/AVR/hal_adc_lld.h b/os/hal/ports/AVR/MEGA/hal_adc_lld.h
similarity index 100%
rename from os/hal/ports/AVR/hal_adc_lld.h
rename to os/hal/ports/AVR/MEGA/hal_adc_lld.h
diff --git a/os/hal/ports/AVR/hal_ext_lld.c b/os/hal/ports/AVR/MEGA/hal_ext_lld.c
similarity index 100%
rename from os/hal/ports/AVR/hal_ext_lld.c
rename to os/hal/ports/AVR/MEGA/hal_ext_lld.c
diff --git a/os/hal/ports/AVR/hal_ext_lld.h b/os/hal/ports/AVR/MEGA/hal_ext_lld.h
similarity index 100%
rename from os/hal/ports/AVR/hal_ext_lld.h
rename to os/hal/ports/AVR/MEGA/hal_ext_lld.h
diff --git a/os/hal/ports/AVR/hal_gpt_lld.c b/os/hal/ports/AVR/MEGA/hal_gpt_lld.c
similarity index 100%
rename from os/hal/ports/AVR/hal_gpt_lld.c
rename to os/hal/ports/AVR/MEGA/hal_gpt_lld.c
diff --git a/os/hal/ports/AVR/hal_gpt_lld.h b/os/hal/ports/AVR/MEGA/hal_gpt_lld.h
similarity index 100%
rename from os/hal/ports/AVR/hal_gpt_lld.h
rename to os/hal/ports/AVR/MEGA/hal_gpt_lld.h
diff --git a/os/hal/ports/AVR/hal_i2c_lld.c b/os/hal/ports/AVR/MEGA/hal_i2c_lld.c
similarity index 100%
rename from os/hal/ports/AVR/hal_i2c_lld.c
rename to os/hal/ports/AVR/MEGA/hal_i2c_lld.c
diff --git a/os/hal/ports/AVR/hal_i2c_lld.h b/os/hal/ports/AVR/MEGA/hal_i2c_lld.h
similarity index 100%
rename from os/hal/ports/AVR/hal_i2c_lld.h
rename to os/hal/ports/AVR/MEGA/hal_i2c_lld.h
diff --git a/os/hal/ports/AVR/hal_icu_lld.c b/os/hal/ports/AVR/MEGA/hal_icu_lld.c
similarity index 100%
rename from os/hal/ports/AVR/hal_icu_lld.c
rename to os/hal/ports/AVR/MEGA/hal_icu_lld.c
diff --git a/os/hal/ports/AVR/hal_icu_lld.h b/os/hal/ports/AVR/MEGA/hal_icu_lld.h
similarity index 100%
rename from os/hal/ports/AVR/hal_icu_lld.h
rename to os/hal/ports/AVR/MEGA/hal_icu_lld.h
diff --git a/os/hal/ports/AVR/hal_lld.c b/os/hal/ports/AVR/MEGA/hal_lld.c
similarity index 100%
rename from os/hal/ports/AVR/hal_lld.c
rename to os/hal/ports/AVR/MEGA/hal_lld.c
diff --git a/os/hal/ports/AVR/hal_lld.h b/os/hal/ports/AVR/MEGA/hal_lld.h
similarity index 100%
rename from os/hal/ports/AVR/hal_lld.h
rename to os/hal/ports/AVR/MEGA/hal_lld.h
diff --git a/os/hal/ports/AVR/hal_pal_lld.c b/os/hal/ports/AVR/MEGA/hal_pal_lld.c
similarity index 100%
rename from os/hal/ports/AVR/hal_pal_lld.c
rename to os/hal/ports/AVR/MEGA/hal_pal_lld.c
diff --git a/os/hal/ports/AVR/hal_pal_lld.h b/os/hal/ports/AVR/MEGA/hal_pal_lld.h
similarity index 100%
rename from os/hal/ports/AVR/hal_pal_lld.h
rename to os/hal/ports/AVR/MEGA/hal_pal_lld.h
diff --git a/os/hal/ports/AVR/hal_pwm_lld.c b/os/hal/ports/AVR/MEGA/hal_pwm_lld.c
similarity index 100%
rename from os/hal/ports/AVR/hal_pwm_lld.c
rename to os/hal/ports/AVR/MEGA/hal_pwm_lld.c
diff --git a/os/hal/ports/AVR/hal_pwm_lld.h b/os/hal/ports/AVR/MEGA/hal_pwm_lld.h
similarity index 100%
rename from os/hal/ports/AVR/hal_pwm_lld.h
rename to os/hal/ports/AVR/MEGA/hal_pwm_lld.h
diff --git a/os/hal/ports/AVR/hal_serial_lld.c b/os/hal/ports/AVR/MEGA/hal_serial_lld.c
similarity index 100%
rename from os/hal/ports/AVR/hal_serial_lld.c
rename to os/hal/ports/AVR/MEGA/hal_serial_lld.c
diff --git a/os/hal/ports/AVR/hal_serial_lld.h b/os/hal/ports/AVR/MEGA/hal_serial_lld.h
similarity index 100%
rename from os/hal/ports/AVR/hal_serial_lld.h
rename to os/hal/ports/AVR/MEGA/hal_serial_lld.h
diff --git a/os/hal/ports/AVR/hal_spi_lld.c b/os/hal/ports/AVR/MEGA/hal_spi_lld.c
similarity index 100%
rename from os/hal/ports/AVR/hal_spi_lld.c
rename to os/hal/ports/AVR/MEGA/hal_spi_lld.c
diff --git a/os/hal/ports/AVR/hal_spi_lld.h b/os/hal/ports/AVR/MEGA/hal_spi_lld.h
similarity index 100%
rename from os/hal/ports/AVR/hal_spi_lld.h
rename to os/hal/ports/AVR/MEGA/hal_spi_lld.h
diff --git a/os/hal/ports/AVR/hal_st_lld.c b/os/hal/ports/AVR/MEGA/hal_st_lld.c
similarity index 100%
rename from os/hal/ports/AVR/hal_st_lld.c
rename to os/hal/ports/AVR/MEGA/hal_st_lld.c
diff --git a/os/hal/ports/AVR/hal_st_lld.h b/os/hal/ports/AVR/MEGA/hal_st_lld.h
similarity index 100%
rename from os/hal/ports/AVR/hal_st_lld.h
rename to os/hal/ports/AVR/MEGA/hal_st_lld.h
diff --git a/os/hal/ports/AVR/hal_usb_lld.c b/os/hal/ports/AVR/MEGA/hal_usb_lld.c
similarity index 100%
rename from os/hal/ports/AVR/hal_usb_lld.c
rename to os/hal/ports/AVR/MEGA/hal_usb_lld.c
diff --git a/os/hal/ports/AVR/hal_usb_lld.h b/os/hal/ports/AVR/MEGA/hal_usb_lld.h
similarity index 100%
rename from os/hal/ports/AVR/hal_usb_lld.h
rename to os/hal/ports/AVR/MEGA/hal_usb_lld.h
diff --git a/os/hal/ports/AVR/MEGA/platform.mk b/os/hal/ports/AVR/MEGA/platform.mk
new file mode 100644
index 000000000..d7c355d54
--- /dev/null
+++ b/os/hal/ports/AVR/MEGA/platform.mk
@@ -0,0 +1,16 @@
+# List of all the AVR platform files.
+PLATFORMSRC = ${CHIBIOS}/os/hal/ports/AVR/MEGA/hal_lld.c \
+              ${CHIBIOS}/os/hal/ports/AVR/MEGA/hal_pal_lld.c \
+              ${CHIBIOS}/os/hal/ports/AVR/MEGA/hal_serial_lld.c \
+              ${CHIBIOS}/os/hal/ports/AVR/MEGA/hal_adc_lld.c \
+              ${CHIBIOS}/os/hal/ports/AVR/MEGA/hal_ext_lld.c \
+              ${CHIBIOS}/os/hal/ports/AVR/MEGA/hal_i2c_lld.c \
+              ${CHIBIOS}/os/hal/ports/AVR/MEGA/hal_spi_lld.c \
+              ${CHIBIOS}/os/hal/ports/AVR/MEGA/hal_gpt_lld.c \
+              ${CHIBIOS}/os/hal/ports/AVR/MEGA/hal_pwm_lld.c \
+              ${CHIBIOS}/os/hal/ports/AVR/MEGA/hal_icu_lld.c \
+              ${CHIBIOS}/os/hal/ports/AVR/MEGA/hal_usb_lld.c \
+              ${CHIBIOS}/os/hal/ports/AVR/MEGA/hal_st_lld.c
+
+# Required include directories
+PLATFORMINC = ${CHIBIOS}/os/hal/ports/AVR/MEGA
diff --git a/os/hal/ports/AVR/platform.mk b/os/hal/ports/AVR/platform.mk
deleted file mode 100644
index 8c9389fdc..000000000
--- a/os/hal/ports/AVR/platform.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# List of all the AVR platform files.
-PLATFORMSRC = ${CHIBIOS}/os/hal/ports/AVR/hal_lld.c \
-              ${CHIBIOS}/os/hal/ports/AVR/hal_pal_lld.c \
-              ${CHIBIOS}/os/hal/ports/AVR/hal_serial_lld.c \
-              ${CHIBIOS}/os/hal/ports/AVR/hal_adc_lld.c \
-              ${CHIBIOS}/os/hal/ports/AVR/hal_ext_lld.c \
-              ${CHIBIOS}/os/hal/ports/AVR/hal_i2c_lld.c \
-              ${CHIBIOS}/os/hal/ports/AVR/hal_spi_lld.c \
-              ${CHIBIOS}/os/hal/ports/AVR/hal_gpt_lld.c \
-              ${CHIBIOS}/os/hal/ports/AVR/hal_pwm_lld.c \
-              ${CHIBIOS}/os/hal/ports/AVR/hal_icu_lld.c \
-              ${CHIBIOS}/os/hal/ports/AVR/hal_usb_lld.c \
-              ${CHIBIOS}/os/hal/ports/AVR/hal_st_lld.c
-
-# Required include directories
-PLATFORMINC = ${CHIBIOS}/os/hal/ports/AVR