diff --git a/os/hal/ports/AVR/MEGA/ADCv1/driver.mk b/os/hal/ports/AVR/MEGA/ADCv1/driver.mk
new file mode 100644
index 000000000..8c8f37a6a
--- /dev/null
+++ b/os/hal/ports/AVR/MEGA/ADCv1/driver.mk
@@ -0,0 +1,9 @@
+ifeq ($(USE_SMART_BUILD),yes)
+ifneq ($(findstring HAL_USE_ADC TRUE,$(HALCONF)),)
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/ADCv1/hal_adc_lld.c
+endif
+else
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/ADCv1/hal_adc_lld.c
+endif
+
+PLATFORMINC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/ADCv1
diff --git a/os/hal/ports/AVR/MEGA/hal_adc_lld.c b/os/hal/ports/AVR/MEGA/ADCv1/hal_adc_lld.c
similarity index 100%
rename from os/hal/ports/AVR/MEGA/hal_adc_lld.c
rename to os/hal/ports/AVR/MEGA/ADCv1/hal_adc_lld.c
diff --git a/os/hal/ports/AVR/MEGA/hal_adc_lld.h b/os/hal/ports/AVR/MEGA/ADCv1/hal_adc_lld.h
similarity index 100%
rename from os/hal/ports/AVR/MEGA/hal_adc_lld.h
rename to os/hal/ports/AVR/MEGA/ADCv1/hal_adc_lld.h
diff --git a/os/hal/ports/AVR/MEGA/EXTv1/driver.mk b/os/hal/ports/AVR/MEGA/EXTv1/driver.mk
new file mode 100644
index 000000000..695513c9c
--- /dev/null
+++ b/os/hal/ports/AVR/MEGA/EXTv1/driver.mk
@@ -0,0 +1,9 @@
+ifeq ($(USE_SMART_BUILD),yes)
+ifneq ($(findstring HAL_USE_ADC TRUE,$(HALCONF)),)
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/EXTv1/hal_ext_lld.c
+endif
+else
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/EXTv1/hal_ext_lld.c
+endif
+
+PLATFORMINC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/EXTv1
diff --git a/os/hal/ports/AVR/MEGA/hal_ext_lld.c b/os/hal/ports/AVR/MEGA/EXTv1/hal_ext_lld.c
similarity index 100%
rename from os/hal/ports/AVR/MEGA/hal_ext_lld.c
rename to os/hal/ports/AVR/MEGA/EXTv1/hal_ext_lld.c
diff --git a/os/hal/ports/AVR/MEGA/hal_ext_lld.h b/os/hal/ports/AVR/MEGA/EXTv1/hal_ext_lld.h
similarity index 100%
rename from os/hal/ports/AVR/MEGA/hal_ext_lld.h
rename to os/hal/ports/AVR/MEGA/EXTv1/hal_ext_lld.h
diff --git a/os/hal/ports/AVR/MEGA/GPIOv1/driver.mk b/os/hal/ports/AVR/MEGA/GPIOv1/driver.mk
new file mode 100644
index 000000000..94197663e
--- /dev/null
+++ b/os/hal/ports/AVR/MEGA/GPIOv1/driver.mk
@@ -0,0 +1,9 @@
+ifeq ($(USE_SMART_BUILD),yes)
+ifneq ($(findstring HAL_USE_ADC TRUE,$(HALCONF)),)
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/GPIOv1/hal_pal_lld.c
+endif
+else
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/GPIOv1/hal_pal_lld.c
+endif
+
+PLATFORMINC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/GPIOv1
diff --git a/os/hal/ports/AVR/MEGA/hal_pal_lld.c b/os/hal/ports/AVR/MEGA/GPIOv1/hal_pal_lld.c
similarity index 100%
rename from os/hal/ports/AVR/MEGA/hal_pal_lld.c
rename to os/hal/ports/AVR/MEGA/GPIOv1/hal_pal_lld.c
diff --git a/os/hal/ports/AVR/MEGA/hal_pal_lld.h b/os/hal/ports/AVR/MEGA/GPIOv1/hal_pal_lld.h
similarity index 100%
rename from os/hal/ports/AVR/MEGA/hal_pal_lld.h
rename to os/hal/ports/AVR/MEGA/GPIOv1/hal_pal_lld.h
diff --git a/os/hal/ports/AVR/MEGA/I2Cv1/driver.mk b/os/hal/ports/AVR/MEGA/I2Cv1/driver.mk
new file mode 100644
index 000000000..9376b483a
--- /dev/null
+++ b/os/hal/ports/AVR/MEGA/I2Cv1/driver.mk
@@ -0,0 +1,9 @@
+ifeq ($(USE_SMART_BUILD),yes)
+ifneq ($(findstring HAL_USE_ADC TRUE,$(HALCONF)),)
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/I2Cv1/hal_i2c_lld.c
+endif
+else
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/I2Cv1/hal_i2c_lld.c
+endif
+
+PLATFORMINC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/I2Cv1
diff --git a/os/hal/ports/AVR/MEGA/hal_i2c_lld.c b/os/hal/ports/AVR/MEGA/I2Cv1/hal_i2c_lld.c
similarity index 100%
rename from os/hal/ports/AVR/MEGA/hal_i2c_lld.c
rename to os/hal/ports/AVR/MEGA/I2Cv1/hal_i2c_lld.c
diff --git a/os/hal/ports/AVR/MEGA/hal_i2c_lld.h b/os/hal/ports/AVR/MEGA/I2Cv1/hal_i2c_lld.h
similarity index 100%
rename from os/hal/ports/AVR/MEGA/hal_i2c_lld.h
rename to os/hal/ports/AVR/MEGA/I2Cv1/hal_i2c_lld.h
diff --git a/os/hal/ports/AVR/MEGA/SPIv1/driver.mk b/os/hal/ports/AVR/MEGA/SPIv1/driver.mk
new file mode 100644
index 000000000..8f3fcba88
--- /dev/null
+++ b/os/hal/ports/AVR/MEGA/SPIv1/driver.mk
@@ -0,0 +1,9 @@
+ifeq ($(USE_SMART_BUILD),yes)
+ifneq ($(findstring HAL_USE_ADC TRUE,$(HALCONF)),)
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/SPIv1/hal_spi_lld.c
+endif
+else
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/SPIv1/hal_spi_lld.c
+endif
+
+PLATFORMINC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/SPIv1
diff --git a/os/hal/ports/AVR/MEGA/hal_spi_lld.c b/os/hal/ports/AVR/MEGA/SPIv1/hal_spi_lld.c
similarity index 100%
rename from os/hal/ports/AVR/MEGA/hal_spi_lld.c
rename to os/hal/ports/AVR/MEGA/SPIv1/hal_spi_lld.c
diff --git a/os/hal/ports/AVR/MEGA/hal_spi_lld.h b/os/hal/ports/AVR/MEGA/SPIv1/hal_spi_lld.h
similarity index 100%
rename from os/hal/ports/AVR/MEGA/hal_spi_lld.h
rename to os/hal/ports/AVR/MEGA/SPIv1/hal_spi_lld.h
diff --git a/os/hal/ports/AVR/MEGA/TIMv1/driver.mk b/os/hal/ports/AVR/MEGA/TIMv1/driver.mk
new file mode 100644
index 000000000..976fc6d94
--- /dev/null
+++ b/os/hal/ports/AVR/MEGA/TIMv1/driver.mk
@@ -0,0 +1,19 @@
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/TIMv1/hal_st_lld.c
+
+ifeq ($(USE_SMART_BUILD),yes)
+ifneq ($(findstring HAL_USE_GPT TRUE,$(HALCONF)),)
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/TIMv1/hal_gpt_lld.c
+endif
+ifneq ($(findstring HAL_USE_ICU TRUE,$(HALCONF)),)
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/TIMv1/hal_icu_lld.c
+endif
+ifneq ($(findstring HAL_USE_PWM TRUE,$(HALCONF)),)
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/TIMv1/hal_pwm_lld.c
+endif
+else
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/TIMv1/hal_gpt_lld.c
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/TIMv1/hal_icu_lld.c
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/TIMv1/hal_pwm_lld.c
+endif
+
+PLATFORMINC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/TIMv1
diff --git a/os/hal/ports/AVR/MEGA/hal_gpt_lld.c b/os/hal/ports/AVR/MEGA/TIMv1/hal_gpt_lld.c
similarity index 100%
rename from os/hal/ports/AVR/MEGA/hal_gpt_lld.c
rename to os/hal/ports/AVR/MEGA/TIMv1/hal_gpt_lld.c
diff --git a/os/hal/ports/AVR/MEGA/hal_gpt_lld.h b/os/hal/ports/AVR/MEGA/TIMv1/hal_gpt_lld.h
similarity index 100%
rename from os/hal/ports/AVR/MEGA/hal_gpt_lld.h
rename to os/hal/ports/AVR/MEGA/TIMv1/hal_gpt_lld.h
diff --git a/os/hal/ports/AVR/MEGA/hal_icu_lld.c b/os/hal/ports/AVR/MEGA/TIMv1/hal_icu_lld.c
similarity index 100%
rename from os/hal/ports/AVR/MEGA/hal_icu_lld.c
rename to os/hal/ports/AVR/MEGA/TIMv1/hal_icu_lld.c
diff --git a/os/hal/ports/AVR/MEGA/hal_icu_lld.h b/os/hal/ports/AVR/MEGA/TIMv1/hal_icu_lld.h
similarity index 100%
rename from os/hal/ports/AVR/MEGA/hal_icu_lld.h
rename to os/hal/ports/AVR/MEGA/TIMv1/hal_icu_lld.h
diff --git a/os/hal/ports/AVR/MEGA/hal_pwm_lld.c b/os/hal/ports/AVR/MEGA/TIMv1/hal_pwm_lld.c
similarity index 100%
rename from os/hal/ports/AVR/MEGA/hal_pwm_lld.c
rename to os/hal/ports/AVR/MEGA/TIMv1/hal_pwm_lld.c
diff --git a/os/hal/ports/AVR/MEGA/hal_pwm_lld.h b/os/hal/ports/AVR/MEGA/TIMv1/hal_pwm_lld.h
similarity index 100%
rename from os/hal/ports/AVR/MEGA/hal_pwm_lld.h
rename to os/hal/ports/AVR/MEGA/TIMv1/hal_pwm_lld.h
diff --git a/os/hal/ports/AVR/MEGA/hal_st_lld.c b/os/hal/ports/AVR/MEGA/TIMv1/hal_st_lld.c
similarity index 100%
rename from os/hal/ports/AVR/MEGA/hal_st_lld.c
rename to os/hal/ports/AVR/MEGA/TIMv1/hal_st_lld.c
diff --git a/os/hal/ports/AVR/MEGA/hal_st_lld.h b/os/hal/ports/AVR/MEGA/TIMv1/hal_st_lld.h
similarity index 100%
rename from os/hal/ports/AVR/MEGA/hal_st_lld.h
rename to os/hal/ports/AVR/MEGA/TIMv1/hal_st_lld.h
diff --git a/os/hal/ports/AVR/MEGA/USARTv1/driver.mk b/os/hal/ports/AVR/MEGA/USARTv1/driver.mk
new file mode 100644
index 000000000..40e21421c
--- /dev/null
+++ b/os/hal/ports/AVR/MEGA/USARTv1/driver.mk
@@ -0,0 +1,9 @@
+ifeq ($(USE_SMART_BUILD),yes)
+ifneq ($(findstring HAL_USE_ADC TRUE,$(HALCONF)),)
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/USARTv1/hal_serial_lld.c
+endif
+else
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/USARTv1/hal_serial_lld.c
+endif
+
+PLATFORMINC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/USARTv1
diff --git a/os/hal/ports/AVR/MEGA/hal_serial_lld.c b/os/hal/ports/AVR/MEGA/USARTv1/hal_serial_lld.c
similarity index 100%
rename from os/hal/ports/AVR/MEGA/hal_serial_lld.c
rename to os/hal/ports/AVR/MEGA/USARTv1/hal_serial_lld.c
diff --git a/os/hal/ports/AVR/MEGA/hal_serial_lld.h b/os/hal/ports/AVR/MEGA/USARTv1/hal_serial_lld.h
similarity index 100%
rename from os/hal/ports/AVR/MEGA/hal_serial_lld.h
rename to os/hal/ports/AVR/MEGA/USARTv1/hal_serial_lld.h
diff --git a/os/hal/ports/AVR/MEGA/USBv1/driver.mk b/os/hal/ports/AVR/MEGA/USBv1/driver.mk
new file mode 100644
index 000000000..26471daf8
--- /dev/null
+++ b/os/hal/ports/AVR/MEGA/USBv1/driver.mk
@@ -0,0 +1,9 @@
+ifeq ($(USE_SMART_BUILD),yes)
+ifneq ($(findstring HAL_USE_ADC TRUE,$(HALCONF)),)
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/USBv1/hal_usb_lld.c
+endif
+else
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/USBv1/hal_usb_lld.c
+endif
+
+PLATFORMINC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/USBv1
diff --git a/os/hal/ports/AVR/MEGA/hal_usb_lld.c b/os/hal/ports/AVR/MEGA/USBv1/hal_usb_lld.c
similarity index 100%
rename from os/hal/ports/AVR/MEGA/hal_usb_lld.c
rename to os/hal/ports/AVR/MEGA/USBv1/hal_usb_lld.c
diff --git a/os/hal/ports/AVR/MEGA/hal_usb_lld.h b/os/hal/ports/AVR/MEGA/USBv1/hal_usb_lld.h
similarity index 100%
rename from os/hal/ports/AVR/MEGA/hal_usb_lld.h
rename to os/hal/ports/AVR/MEGA/USBv1/hal_usb_lld.h
diff --git a/os/hal/ports/AVR/MEGA/platform.mk b/os/hal/ports/AVR/MEGA/platform.mk
index d7c355d54..0e47351ce 100644
--- a/os/hal/ports/AVR/MEGA/platform.mk
+++ b/os/hal/ports/AVR/MEGA/platform.mk
@@ -1,16 +1,15 @@
 # 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
+
+# Drivers compatible with the platform.
+include $(CHIBIOS)/os/hal/ports/AVR/MEGA/ADCv1/driver.mk
+include $(CHIBIOS)/os/hal/ports/AVR/MEGA/EXTv1/driver.mk
+include $(CHIBIOS)/os/hal/ports/AVR/MEGA/GPIOv1/driver.mk
+include $(CHIBIOS)/os/hal/ports/AVR/MEGA/I2Cv1/driver.mk
+include $(CHIBIOS)/os/hal/ports/AVR/MEGA/SPIv1/driver.mk
+include $(CHIBIOS)/os/hal/ports/AVR/MEGA/TIMv1/driver.mk
+include $(CHIBIOS)/os/hal/ports/AVR/MEGA/USARTv1/driver.mk
+include $(CHIBIOS)/os/hal/ports/AVR/MEGA/USBv1/driver.mk