diff --git a/os/hal/ports/AVR/MEGA/LLD/ADCv1/driver.mk b/os/hal/ports/AVR/MEGA/LLD/ADCv1/driver.mk
index 8c8f37a6a..895e624e8 100644
--- a/os/hal/ports/AVR/MEGA/LLD/ADCv1/driver.mk
+++ b/os/hal/ports/AVR/MEGA/LLD/ADCv1/driver.mk
@@ -1,9 +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
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/LLD/ADCv1/hal_adc_lld.c
 endif
 else
-PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/ADCv1/hal_adc_lld.c
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/LLD/ADCv1/hal_adc_lld.c
 endif
 
-PLATFORMINC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/ADCv1
+PLATFORMINC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/LLD/ADCv1
diff --git a/os/hal/ports/AVR/MEGA/LLD/EXTv1/driver.mk b/os/hal/ports/AVR/MEGA/LLD/EXTv1/driver.mk
index cc4993983..428db9440 100644
--- a/os/hal/ports/AVR/MEGA/LLD/EXTv1/driver.mk
+++ b/os/hal/ports/AVR/MEGA/LLD/EXTv1/driver.mk
@@ -1,9 +1,9 @@
 ifeq ($(USE_SMART_BUILD),yes)
 ifneq ($(findstring HAL_USE_EXT TRUE,$(HALCONF)),)
-PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/EXTv1/hal_ext_lld.c
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/LLD/EXTv1/hal_ext_lld.c
 endif
 else
-PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/EXTv1/hal_ext_lld.c
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/LLD/EXTv1/hal_ext_lld.c
 endif
 
-PLATFORMINC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/EXTv1
+PLATFORMINC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/LLD/EXTv1
diff --git a/os/hal/ports/AVR/MEGA/LLD/GPIOv1/driver.mk b/os/hal/ports/AVR/MEGA/LLD/GPIOv1/driver.mk
index 0bc2cd1b3..5cd032844 100644
--- a/os/hal/ports/AVR/MEGA/LLD/GPIOv1/driver.mk
+++ b/os/hal/ports/AVR/MEGA/LLD/GPIOv1/driver.mk
@@ -1,9 +1,9 @@
 ifeq ($(USE_SMART_BUILD),yes)
 ifneq ($(findstring HAL_USE_PAL TRUE,$(HALCONF)),)
-PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/GPIOv1/hal_pal_lld.c
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/LLD/GPIOv1/hal_pal_lld.c
 endif
 else
-PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/GPIOv1/hal_pal_lld.c
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/LLD/GPIOv1/hal_pal_lld.c
 endif
 
-PLATFORMINC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/GPIOv1
+PLATFORMINC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/LLD/GPIOv1
diff --git a/os/hal/ports/AVR/MEGA/LLD/I2Cv1/driver.mk b/os/hal/ports/AVR/MEGA/LLD/I2Cv1/driver.mk
index 8882990e1..a37ed2b23 100644
--- a/os/hal/ports/AVR/MEGA/LLD/I2Cv1/driver.mk
+++ b/os/hal/ports/AVR/MEGA/LLD/I2Cv1/driver.mk
@@ -1,9 +1,9 @@
 ifeq ($(USE_SMART_BUILD),yes)
 ifneq ($(findstring HAL_USE_I2C TRUE,$(HALCONF)),)
-PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/I2Cv1/hal_i2c_lld.c
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/LLD/I2Cv1/hal_i2c_lld.c
 endif
 else
-PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/I2Cv1/hal_i2c_lld.c
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/LLD/I2Cv1/hal_i2c_lld.c
 endif
 
-PLATFORMINC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/I2Cv1
+PLATFORMINC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/LLD/I2Cv1
diff --git a/os/hal/ports/AVR/MEGA/LLD/SPIv1/driver.mk b/os/hal/ports/AVR/MEGA/LLD/SPIv1/driver.mk
index 0f98a1a62..54ffb6e80 100644
--- a/os/hal/ports/AVR/MEGA/LLD/SPIv1/driver.mk
+++ b/os/hal/ports/AVR/MEGA/LLD/SPIv1/driver.mk
@@ -1,9 +1,9 @@
 ifeq ($(USE_SMART_BUILD),yes)
 ifneq ($(findstring HAL_USE_SPI TRUE,$(HALCONF)),)
-PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/SPIv1/hal_spi_lld.c
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/LLD/SPIv1/hal_spi_lld.c
 endif
 else
-PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/SPIv1/hal_spi_lld.c
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/LLD/SPIv1/hal_spi_lld.c
 endif
 
-PLATFORMINC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/SPIv1
+PLATFORMINC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/LLD/SPIv1
diff --git a/os/hal/ports/AVR/MEGA/LLD/TIMv1/driver.mk b/os/hal/ports/AVR/MEGA/LLD/TIMv1/driver.mk
index 976fc6d94..27180e6dd 100644
--- a/os/hal/ports/AVR/MEGA/LLD/TIMv1/driver.mk
+++ b/os/hal/ports/AVR/MEGA/LLD/TIMv1/driver.mk
@@ -1,19 +1,19 @@
-PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/TIMv1/hal_st_lld.c
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/LLD/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
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/LLD/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
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/LLD/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
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/LLD/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
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/LLD/TIMv1/hal_gpt_lld.c
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/LLD/TIMv1/hal_icu_lld.c
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/LLD/TIMv1/hal_pwm_lld.c
 endif
 
-PLATFORMINC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/TIMv1
+PLATFORMINC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/LLD/TIMv1
diff --git a/os/hal/ports/AVR/MEGA/LLD/USARTv1/driver.mk b/os/hal/ports/AVR/MEGA/LLD/USARTv1/driver.mk
index 8472e9538..329411ab3 100644
--- a/os/hal/ports/AVR/MEGA/LLD/USARTv1/driver.mk
+++ b/os/hal/ports/AVR/MEGA/LLD/USARTv1/driver.mk
@@ -1,9 +1,9 @@
 ifeq ($(USE_SMART_BUILD),yes)
 ifneq ($(findstring HAL_USE_SERIAL TRUE,$(HALCONF)),)
-PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/USARTv1/hal_serial_lld.c
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/LLD/USARTv1/hal_serial_lld.c
 endif
 else
-PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/USARTv1/hal_serial_lld.c
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/LLD/USARTv1/hal_serial_lld.c
 endif
 
-PLATFORMINC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/USARTv1
+PLATFORMINC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/LLD/USARTv1
diff --git a/os/hal/ports/AVR/MEGA/LLD/USBv1/driver.mk b/os/hal/ports/AVR/MEGA/LLD/USBv1/driver.mk
index bb6c14b64..655bb6a70 100644
--- a/os/hal/ports/AVR/MEGA/LLD/USBv1/driver.mk
+++ b/os/hal/ports/AVR/MEGA/LLD/USBv1/driver.mk
@@ -1,9 +1,9 @@
 ifeq ($(USE_SMART_BUILD),yes)
 ifneq ($(findstring HAL_USE_USB TRUE,$(HALCONF)),)
-PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/USBv1/hal_usb_lld.c
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/LLD/USBv1/hal_usb_lld.c
 endif
 else
-PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/USBv1/hal_usb_lld.c
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/LLD/USBv1/hal_usb_lld.c
 endif
 
-PLATFORMINC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/USBv1
+PLATFORMINC += $(CHIBIOS)/os/hal/ports/AVR/MEGA/LLD/USBv1