diff --git a/demos/ARMCM3-STM32F103/Makefile b/demos/ARMCM3-STM32F103/Makefile
index 74f23b072..884838604 100644
--- a/demos/ARMCM3-STM32F103/Makefile
+++ b/demos/ARMCM3-STM32F103/Makefile
@@ -58,7 +58,7 @@ LDSCRIPT= ch.ld
 # Imported source files
 CHIBIOS = ../..
 include $(CHIBIOS)/boards/OLIMEX_STM32_P103/board.mk
-include $(CHIBIOS)/os/hal/platforms/STM32/platform.mk
+include $(CHIBIOS)/os/hal/platforms/STM32F1xx/platform.mk
 include $(CHIBIOS)/os/hal/hal.mk
 include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32/port.mk
 include $(CHIBIOS)/os/kernel/kernel.mk
diff --git a/os/hal/platforms/STM32/pal_lld.c b/os/hal/platforms/STM32/GPIOv1/pal_lld.c
similarity index 100%
rename from os/hal/platforms/STM32/pal_lld.c
rename to os/hal/platforms/STM32/GPIOv1/pal_lld.c
diff --git a/os/hal/platforms/STM32/pal_lld.h b/os/hal/platforms/STM32/GPIOv1/pal_lld.h
similarity index 100%
rename from os/hal/platforms/STM32/pal_lld.h
rename to os/hal/platforms/STM32/GPIOv1/pal_lld.h
diff --git a/os/hal/platforms/STM32/stm32_usb.h b/os/hal/platforms/STM32/USBv1/stm32_usb.h
similarity index 100%
rename from os/hal/platforms/STM32/stm32_usb.h
rename to os/hal/platforms/STM32/USBv1/stm32_usb.h
diff --git a/os/hal/platforms/STM32/usb_lld.c b/os/hal/platforms/STM32/USBv1/usb_lld.c
similarity index 100%
rename from os/hal/platforms/STM32/usb_lld.c
rename to os/hal/platforms/STM32/USBv1/usb_lld.c
diff --git a/os/hal/platforms/STM32/usb_lld.h b/os/hal/platforms/STM32/USBv1/usb_lld.h
similarity index 100%
rename from os/hal/platforms/STM32/usb_lld.h
rename to os/hal/platforms/STM32/USBv1/usb_lld.h
diff --git a/os/hal/platforms/STM32F1xx/platform.mk b/os/hal/platforms/STM32F1xx/platform.mk
index f0aec9de6..afb7035bb 100644
--- a/os/hal/platforms/STM32F1xx/platform.mk
+++ b/os/hal/platforms/STM32F1xx/platform.mk
@@ -1,17 +1,21 @@
-# List of all the STM32 platform files.
-PLATFORMSRC = ${CHIBIOS}/os/hal/platforms/STM32/hal_lld.c \
-              ${CHIBIOS}/os/hal/platforms/STM32/adc_lld.c \
+# List of all the STM32F1xx platform files.
+PLATFORMSRC = ${CHIBIOS}/os/hal/platforms/STM32F1xx/hal_lld.c \
               ${CHIBIOS}/os/hal/platforms/STM32/can_lld.c \
               ${CHIBIOS}/os/hal/platforms/STM32/gpt_lld.c \
               ${CHIBIOS}/os/hal/platforms/STM32/icu_lld.c \
-              ${CHIBIOS}/os/hal/platforms/STM32/pal_lld.c \
               ${CHIBIOS}/os/hal/platforms/STM32/pwm_lld.c \
-              ${CHIBIOS}/os/hal/platforms/STM32/sdc_lld.c \
               ${CHIBIOS}/os/hal/platforms/STM32/serial_lld.c \
-              ${CHIBIOS}/os/hal/platforms/STM32/spi_lld.c \
-              ${CHIBIOS}/os/hal/platforms/STM32/uart_lld.c \
-              ${CHIBIOS}/os/hal/platforms/STM32/usb_lld.c \
-              ${CHIBIOS}/os/hal/platforms/STM32/stm32_dma.c
+              ${CHIBIOS}/os/hal/platforms/STM32/GPIOv1/pal_lld.c \
+              ${CHIBIOS}/os/hal/platforms/STM32/DMAv1/adc_lld.c \
+              ${CHIBIOS}/os/hal/platforms/STM32/DMAv1/sdc_lld.c \
+              ${CHIBIOS}/os/hal/platforms/STM32/DMAv1/spi_lld.c \
+              ${CHIBIOS}/os/hal/platforms/STM32/DMAv1/uart_lld.c \
+              ${CHIBIOS}/os/hal/platforms/STM32/DMAv1/stm32_dma.c \
+              ${CHIBIOS}/os/hal/platforms/STM32/USBv1/usb_lld.c
 
 # Required include directories
-PLATFORMINC = ${CHIBIOS}/os/hal/platforms/STM32
+PLATFORMINC = ${CHIBIOS}/os/hal/platforms/STM32F1xx \
+              ${CHIBIOS}/os/hal/platforms/STM32 \
+              ${CHIBIOS}/os/hal/platforms/STM32/GPIOv1 \
+              ${CHIBIOS}/os/hal/platforms/STM32/DMAv1 \
+              ${CHIBIOS}/os/hal/platforms/STM32/USBv1