diff --git a/testhal/STM32/STM32F30x/ADC/.cproject b/testhal/STM32/STM32F3xx/ADC/.cproject
similarity index 100%
rename from testhal/STM32/STM32F30x/ADC/.cproject
rename to testhal/STM32/STM32F3xx/ADC/.cproject
diff --git a/testhal/STM32/STM32F30x/ADC/.project b/testhal/STM32/STM32F3xx/ADC/.project
similarity index 100%
rename from testhal/STM32/STM32F30x/ADC/.project
rename to testhal/STM32/STM32F3xx/ADC/.project
diff --git a/testhal/STM32/STM32F30x/ADC/Makefile b/testhal/STM32/STM32F3xx/ADC/Makefile
similarity index 100%
rename from testhal/STM32/STM32F30x/ADC/Makefile
rename to testhal/STM32/STM32F3xx/ADC/Makefile
diff --git a/testhal/STM32/STM32F30x/ADC/chconf.h b/testhal/STM32/STM32F3xx/ADC/chconf.h
similarity index 100%
rename from testhal/STM32/STM32F30x/ADC/chconf.h
rename to testhal/STM32/STM32F3xx/ADC/chconf.h
diff --git a/testhal/STM32/STM32F30x/ADC/debug/STM32F30x-ADC (OpenOCD, Flash and Run).launch b/testhal/STM32/STM32F3xx/ADC/debug/STM32F30x-ADC (OpenOCD, Flash and Run).launch
similarity index 100%
rename from testhal/STM32/STM32F30x/ADC/debug/STM32F30x-ADC (OpenOCD, Flash and Run).launch
rename to testhal/STM32/STM32F3xx/ADC/debug/STM32F30x-ADC (OpenOCD, Flash and Run).launch
diff --git a/testhal/STM32/STM32F30x/ADC/halconf.h b/testhal/STM32/STM32F3xx/ADC/halconf.h
similarity index 100%
rename from testhal/STM32/STM32F30x/ADC/halconf.h
rename to testhal/STM32/STM32F3xx/ADC/halconf.h
diff --git a/testhal/STM32/STM32F30x/ADC/main.c b/testhal/STM32/STM32F3xx/ADC/main.c
similarity index 100%
rename from testhal/STM32/STM32F30x/ADC/main.c
rename to testhal/STM32/STM32F3xx/ADC/main.c
diff --git a/testhal/STM32/STM32F30x/ADC/mcuconf.h b/testhal/STM32/STM32F3xx/ADC/mcuconf.h
similarity index 100%
rename from testhal/STM32/STM32F30x/ADC/mcuconf.h
rename to testhal/STM32/STM32F3xx/ADC/mcuconf.h
diff --git a/testhal/STM32/STM32F30x/ADC/readme.txt b/testhal/STM32/STM32F3xx/ADC/readme.txt
similarity index 100%
rename from testhal/STM32/STM32F30x/ADC/readme.txt
rename to testhal/STM32/STM32F3xx/ADC/readme.txt
diff --git a/testhal/STM32/STM32F30x/ADC_DUAL/.cproject b/testhal/STM32/STM32F3xx/ADC_DUAL/.cproject
similarity index 100%
rename from testhal/STM32/STM32F30x/ADC_DUAL/.cproject
rename to testhal/STM32/STM32F3xx/ADC_DUAL/.cproject
diff --git a/testhal/STM32/STM32F30x/ADC_DUAL/.project b/testhal/STM32/STM32F3xx/ADC_DUAL/.project
similarity index 100%
rename from testhal/STM32/STM32F30x/ADC_DUAL/.project
rename to testhal/STM32/STM32F3xx/ADC_DUAL/.project
diff --git a/testhal/STM32/STM32F30x/ADC_DUAL/Makefile b/testhal/STM32/STM32F3xx/ADC_DUAL/Makefile
similarity index 100%
rename from testhal/STM32/STM32F30x/ADC_DUAL/Makefile
rename to testhal/STM32/STM32F3xx/ADC_DUAL/Makefile
diff --git a/testhal/STM32/STM32F30x/ADC_DUAL/chconf.h b/testhal/STM32/STM32F3xx/ADC_DUAL/chconf.h
similarity index 100%
rename from testhal/STM32/STM32F30x/ADC_DUAL/chconf.h
rename to testhal/STM32/STM32F3xx/ADC_DUAL/chconf.h
diff --git a/testhal/STM32/STM32F30x/ADC_DUAL/debug/STM32F30x-ADC_DUAL (OpenOCD, Flash and Run).launch b/testhal/STM32/STM32F3xx/ADC_DUAL/debug/STM32F30x-ADC_DUAL (OpenOCD, Flash and Run).launch
similarity index 100%
rename from testhal/STM32/STM32F30x/ADC_DUAL/debug/STM32F30x-ADC_DUAL (OpenOCD, Flash and Run).launch
rename to testhal/STM32/STM32F3xx/ADC_DUAL/debug/STM32F30x-ADC_DUAL (OpenOCD, Flash and Run).launch
diff --git a/testhal/STM32/STM32F30x/ADC_DUAL/halconf.h b/testhal/STM32/STM32F3xx/ADC_DUAL/halconf.h
similarity index 100%
rename from testhal/STM32/STM32F30x/ADC_DUAL/halconf.h
rename to testhal/STM32/STM32F3xx/ADC_DUAL/halconf.h
diff --git a/testhal/STM32/STM32F30x/ADC_DUAL/main.c b/testhal/STM32/STM32F3xx/ADC_DUAL/main.c
similarity index 100%
rename from testhal/STM32/STM32F30x/ADC_DUAL/main.c
rename to testhal/STM32/STM32F3xx/ADC_DUAL/main.c
diff --git a/testhal/STM32/STM32F30x/ADC_DUAL/mcuconf.h b/testhal/STM32/STM32F3xx/ADC_DUAL/mcuconf.h
similarity index 100%
rename from testhal/STM32/STM32F30x/ADC_DUAL/mcuconf.h
rename to testhal/STM32/STM32F3xx/ADC_DUAL/mcuconf.h
diff --git a/testhal/STM32/STM32F30x/ADC_DUAL/readme.txt b/testhal/STM32/STM32F3xx/ADC_DUAL/readme.txt
similarity index 100%
rename from testhal/STM32/STM32F30x/ADC_DUAL/readme.txt
rename to testhal/STM32/STM32F3xx/ADC_DUAL/readme.txt
diff --git a/testhal/STM32/STM32F30x/CAN/.cproject b/testhal/STM32/STM32F3xx/CAN/.cproject
similarity index 100%
rename from testhal/STM32/STM32F30x/CAN/.cproject
rename to testhal/STM32/STM32F3xx/CAN/.cproject
diff --git a/testhal/STM32/STM32F30x/CAN/.project b/testhal/STM32/STM32F3xx/CAN/.project
similarity index 100%
rename from testhal/STM32/STM32F30x/CAN/.project
rename to testhal/STM32/STM32F3xx/CAN/.project
diff --git a/testhal/STM32/STM32F30x/CAN/Makefile b/testhal/STM32/STM32F3xx/CAN/Makefile
similarity index 100%
rename from testhal/STM32/STM32F30x/CAN/Makefile
rename to testhal/STM32/STM32F3xx/CAN/Makefile
diff --git a/testhal/STM32/STM32F30x/CAN/chconf.h b/testhal/STM32/STM32F3xx/CAN/chconf.h
similarity index 100%
rename from testhal/STM32/STM32F30x/CAN/chconf.h
rename to testhal/STM32/STM32F3xx/CAN/chconf.h
diff --git a/testhal/STM32/STM32F30x/CAN/halconf.h b/testhal/STM32/STM32F3xx/CAN/halconf.h
similarity index 100%
rename from testhal/STM32/STM32F30x/CAN/halconf.h
rename to testhal/STM32/STM32F3xx/CAN/halconf.h
diff --git a/testhal/STM32/STM32F30x/CAN/main.c b/testhal/STM32/STM32F3xx/CAN/main.c
similarity index 100%
rename from testhal/STM32/STM32F30x/CAN/main.c
rename to testhal/STM32/STM32F3xx/CAN/main.c
diff --git a/testhal/STM32/STM32F30x/CAN/mcuconf.h b/testhal/STM32/STM32F3xx/CAN/mcuconf.h
similarity index 100%
rename from testhal/STM32/STM32F30x/CAN/mcuconf.h
rename to testhal/STM32/STM32F3xx/CAN/mcuconf.h
diff --git a/testhal/STM32/STM32F30x/CAN/readme.txt b/testhal/STM32/STM32F3xx/CAN/readme.txt
similarity index 100%
rename from testhal/STM32/STM32F30x/CAN/readme.txt
rename to testhal/STM32/STM32F3xx/CAN/readme.txt
diff --git a/testhal/STM32/STM32F30x/DAC/.cproject b/testhal/STM32/STM32F3xx/DAC/.cproject
similarity index 100%
rename from testhal/STM32/STM32F30x/DAC/.cproject
rename to testhal/STM32/STM32F3xx/DAC/.cproject
diff --git a/testhal/STM32/STM32F30x/DAC/.project b/testhal/STM32/STM32F3xx/DAC/.project
similarity index 100%
rename from testhal/STM32/STM32F30x/DAC/.project
rename to testhal/STM32/STM32F3xx/DAC/.project
diff --git a/testhal/STM32/STM32F30x/DAC/Makefile b/testhal/STM32/STM32F3xx/DAC/Makefile
similarity index 100%
rename from testhal/STM32/STM32F30x/DAC/Makefile
rename to testhal/STM32/STM32F3xx/DAC/Makefile
diff --git a/testhal/STM32/STM32F30x/DAC/chconf.h b/testhal/STM32/STM32F3xx/DAC/chconf.h
similarity index 100%
rename from testhal/STM32/STM32F30x/DAC/chconf.h
rename to testhal/STM32/STM32F3xx/DAC/chconf.h
diff --git a/testhal/STM32/STM32F30x/DAC/debug/STM32F30x-DAC (OpenOCD, Flash and Run).launch b/testhal/STM32/STM32F3xx/DAC/debug/STM32F30x-DAC (OpenOCD, Flash and Run).launch
similarity index 100%
rename from testhal/STM32/STM32F30x/DAC/debug/STM32F30x-DAC (OpenOCD, Flash and Run).launch
rename to testhal/STM32/STM32F3xx/DAC/debug/STM32F30x-DAC (OpenOCD, Flash and Run).launch
diff --git a/testhal/STM32/STM32F30x/DAC/halconf.h b/testhal/STM32/STM32F3xx/DAC/halconf.h
similarity index 100%
rename from testhal/STM32/STM32F30x/DAC/halconf.h
rename to testhal/STM32/STM32F3xx/DAC/halconf.h
diff --git a/testhal/STM32/STM32F30x/DAC/main.c b/testhal/STM32/STM32F3xx/DAC/main.c
similarity index 100%
rename from testhal/STM32/STM32F30x/DAC/main.c
rename to testhal/STM32/STM32F3xx/DAC/main.c
diff --git a/testhal/STM32/STM32F30x/DAC/mcuconf.h b/testhal/STM32/STM32F3xx/DAC/mcuconf.h
similarity index 100%
rename from testhal/STM32/STM32F30x/DAC/mcuconf.h
rename to testhal/STM32/STM32F3xx/DAC/mcuconf.h
diff --git a/testhal/STM32/STM32F30x/DAC/readme.txt b/testhal/STM32/STM32F3xx/DAC/readme.txt
similarity index 100%
rename from testhal/STM32/STM32F30x/DAC/readme.txt
rename to testhal/STM32/STM32F3xx/DAC/readme.txt
diff --git a/testhal/STM32/STM32F30x/EXT/.cproject b/testhal/STM32/STM32F3xx/EXT/.cproject
similarity index 100%
rename from testhal/STM32/STM32F30x/EXT/.cproject
rename to testhal/STM32/STM32F3xx/EXT/.cproject
diff --git a/testhal/STM32/STM32F30x/EXT/.project b/testhal/STM32/STM32F3xx/EXT/.project
similarity index 100%
rename from testhal/STM32/STM32F30x/EXT/.project
rename to testhal/STM32/STM32F3xx/EXT/.project
diff --git a/testhal/STM32/STM32F30x/EXT/Makefile b/testhal/STM32/STM32F3xx/EXT/Makefile
similarity index 100%
rename from testhal/STM32/STM32F30x/EXT/Makefile
rename to testhal/STM32/STM32F3xx/EXT/Makefile
diff --git a/testhal/STM32/STM32F30x/EXT/chconf.h b/testhal/STM32/STM32F3xx/EXT/chconf.h
similarity index 100%
rename from testhal/STM32/STM32F30x/EXT/chconf.h
rename to testhal/STM32/STM32F3xx/EXT/chconf.h
diff --git a/testhal/STM32/STM32F30x/EXT/halconf.h b/testhal/STM32/STM32F3xx/EXT/halconf.h
similarity index 100%
rename from testhal/STM32/STM32F30x/EXT/halconf.h
rename to testhal/STM32/STM32F3xx/EXT/halconf.h
diff --git a/testhal/STM32/STM32F30x/EXT/main.c b/testhal/STM32/STM32F3xx/EXT/main.c
similarity index 100%
rename from testhal/STM32/STM32F30x/EXT/main.c
rename to testhal/STM32/STM32F3xx/EXT/main.c
diff --git a/testhal/STM32/STM32F30x/EXT/mcuconf.h b/testhal/STM32/STM32F3xx/EXT/mcuconf.h
similarity index 100%
rename from testhal/STM32/STM32F30x/EXT/mcuconf.h
rename to testhal/STM32/STM32F3xx/EXT/mcuconf.h
diff --git a/testhal/STM32/STM32F30x/EXT/readme.txt b/testhal/STM32/STM32F3xx/EXT/readme.txt
similarity index 100%
rename from testhal/STM32/STM32F30x/EXT/readme.txt
rename to testhal/STM32/STM32F3xx/EXT/readme.txt
diff --git a/testhal/STM32/STM32F30x/IRQ_STORM/.cproject b/testhal/STM32/STM32F3xx/IRQ_STORM/.cproject
similarity index 100%
rename from testhal/STM32/STM32F30x/IRQ_STORM/.cproject
rename to testhal/STM32/STM32F3xx/IRQ_STORM/.cproject
diff --git a/testhal/STM32/STM32F30x/IRQ_STORM/.project b/testhal/STM32/STM32F3xx/IRQ_STORM/.project
similarity index 100%
rename from testhal/STM32/STM32F30x/IRQ_STORM/.project
rename to testhal/STM32/STM32F3xx/IRQ_STORM/.project
diff --git a/testhal/STM32/STM32F30x/IRQ_STORM/Makefile b/testhal/STM32/STM32F3xx/IRQ_STORM/Makefile
similarity index 100%
rename from testhal/STM32/STM32F30x/IRQ_STORM/Makefile
rename to testhal/STM32/STM32F3xx/IRQ_STORM/Makefile
diff --git a/testhal/STM32/STM32F30x/IRQ_STORM/chconf.h b/testhal/STM32/STM32F3xx/IRQ_STORM/chconf.h
similarity index 100%
rename from testhal/STM32/STM32F30x/IRQ_STORM/chconf.h
rename to testhal/STM32/STM32F3xx/IRQ_STORM/chconf.h
diff --git a/testhal/STM32/STM32F30x/IRQ_STORM/debug/STM32F30x-IRQ_STORM (OpenOCD, Flash and Run).launch b/testhal/STM32/STM32F3xx/IRQ_STORM/debug/STM32F30x-IRQ_STORM (OpenOCD, Flash and Run).launch
similarity index 100%
rename from testhal/STM32/STM32F30x/IRQ_STORM/debug/STM32F30x-IRQ_STORM (OpenOCD, Flash and Run).launch
rename to testhal/STM32/STM32F3xx/IRQ_STORM/debug/STM32F30x-IRQ_STORM (OpenOCD, Flash and Run).launch
diff --git a/testhal/STM32/STM32F30x/IRQ_STORM/halconf.h b/testhal/STM32/STM32F3xx/IRQ_STORM/halconf.h
similarity index 100%
rename from testhal/STM32/STM32F30x/IRQ_STORM/halconf.h
rename to testhal/STM32/STM32F3xx/IRQ_STORM/halconf.h
diff --git a/testhal/STM32/STM32F30x/IRQ_STORM/main.c b/testhal/STM32/STM32F3xx/IRQ_STORM/main.c
similarity index 100%
rename from testhal/STM32/STM32F30x/IRQ_STORM/main.c
rename to testhal/STM32/STM32F3xx/IRQ_STORM/main.c
diff --git a/testhal/STM32/STM32F30x/IRQ_STORM/mcuconf.h b/testhal/STM32/STM32F3xx/IRQ_STORM/mcuconf.h
similarity index 100%
rename from testhal/STM32/STM32F30x/IRQ_STORM/mcuconf.h
rename to testhal/STM32/STM32F3xx/IRQ_STORM/mcuconf.h
diff --git a/testhal/STM32/STM32F30x/IRQ_STORM/readme.txt b/testhal/STM32/STM32F3xx/IRQ_STORM/readme.txt
similarity index 100%
rename from testhal/STM32/STM32F30x/IRQ_STORM/readme.txt
rename to testhal/STM32/STM32F3xx/IRQ_STORM/readme.txt
diff --git a/testhal/STM32/STM32F30x/PWM-ICU/.cproject b/testhal/STM32/STM32F3xx/PWM-ICU/.cproject
similarity index 100%
rename from testhal/STM32/STM32F30x/PWM-ICU/.cproject
rename to testhal/STM32/STM32F3xx/PWM-ICU/.cproject
diff --git a/testhal/STM32/STM32F30x/PWM-ICU/.project b/testhal/STM32/STM32F3xx/PWM-ICU/.project
similarity index 100%
rename from testhal/STM32/STM32F30x/PWM-ICU/.project
rename to testhal/STM32/STM32F3xx/PWM-ICU/.project
diff --git a/testhal/STM32/STM32F30x/PWM-ICU/Makefile b/testhal/STM32/STM32F3xx/PWM-ICU/Makefile
similarity index 100%
rename from testhal/STM32/STM32F30x/PWM-ICU/Makefile
rename to testhal/STM32/STM32F3xx/PWM-ICU/Makefile
diff --git a/testhal/STM32/STM32F30x/PWM-ICU/chconf.h b/testhal/STM32/STM32F3xx/PWM-ICU/chconf.h
similarity index 100%
rename from testhal/STM32/STM32F30x/PWM-ICU/chconf.h
rename to testhal/STM32/STM32F3xx/PWM-ICU/chconf.h
diff --git a/testhal/STM32/STM32F30x/PWM-ICU/debug/STM32F30x-PWM_ICU (OpenOCD, Flash and Run).launch b/testhal/STM32/STM32F3xx/PWM-ICU/debug/STM32F30x-PWM_ICU (OpenOCD, Flash and Run).launch
similarity index 100%
rename from testhal/STM32/STM32F30x/PWM-ICU/debug/STM32F30x-PWM_ICU (OpenOCD, Flash and Run).launch
rename to testhal/STM32/STM32F3xx/PWM-ICU/debug/STM32F30x-PWM_ICU (OpenOCD, Flash and Run).launch
diff --git a/testhal/STM32/STM32F30x/PWM-ICU/halconf.h b/testhal/STM32/STM32F3xx/PWM-ICU/halconf.h
similarity index 100%
rename from testhal/STM32/STM32F30x/PWM-ICU/halconf.h
rename to testhal/STM32/STM32F3xx/PWM-ICU/halconf.h
diff --git a/testhal/STM32/STM32F30x/PWM-ICU/main.c b/testhal/STM32/STM32F3xx/PWM-ICU/main.c
similarity index 100%
rename from testhal/STM32/STM32F30x/PWM-ICU/main.c
rename to testhal/STM32/STM32F3xx/PWM-ICU/main.c
diff --git a/testhal/STM32/STM32F30x/PWM-ICU/mcuconf.h b/testhal/STM32/STM32F3xx/PWM-ICU/mcuconf.h
similarity index 100%
rename from testhal/STM32/STM32F30x/PWM-ICU/mcuconf.h
rename to testhal/STM32/STM32F3xx/PWM-ICU/mcuconf.h
diff --git a/testhal/STM32/STM32F30x/PWM-ICU/readme.txt b/testhal/STM32/STM32F3xx/PWM-ICU/readme.txt
similarity index 100%
rename from testhal/STM32/STM32F30x/PWM-ICU/readme.txt
rename to testhal/STM32/STM32F3xx/PWM-ICU/readme.txt
diff --git a/testhal/STM32/STM32F30x/SPI/.cproject b/testhal/STM32/STM32F3xx/SPI/.cproject
similarity index 100%
rename from testhal/STM32/STM32F30x/SPI/.cproject
rename to testhal/STM32/STM32F3xx/SPI/.cproject
diff --git a/testhal/STM32/STM32F30x/SPI/.project b/testhal/STM32/STM32F3xx/SPI/.project
similarity index 100%
rename from testhal/STM32/STM32F30x/SPI/.project
rename to testhal/STM32/STM32F3xx/SPI/.project
diff --git a/testhal/STM32/STM32F30x/SPI/Makefile b/testhal/STM32/STM32F3xx/SPI/Makefile
similarity index 100%
rename from testhal/STM32/STM32F30x/SPI/Makefile
rename to testhal/STM32/STM32F3xx/SPI/Makefile
diff --git a/testhal/STM32/STM32F30x/SPI/chconf.h b/testhal/STM32/STM32F3xx/SPI/chconf.h
similarity index 100%
rename from testhal/STM32/STM32F30x/SPI/chconf.h
rename to testhal/STM32/STM32F3xx/SPI/chconf.h
diff --git a/testhal/STM32/STM32F30x/SPI/halconf.h b/testhal/STM32/STM32F3xx/SPI/halconf.h
similarity index 100%
rename from testhal/STM32/STM32F30x/SPI/halconf.h
rename to testhal/STM32/STM32F3xx/SPI/halconf.h
diff --git a/testhal/STM32/STM32F30x/SPI/main.c b/testhal/STM32/STM32F3xx/SPI/main.c
similarity index 100%
rename from testhal/STM32/STM32F30x/SPI/main.c
rename to testhal/STM32/STM32F3xx/SPI/main.c
diff --git a/testhal/STM32/STM32F30x/SPI/mcuconf.h b/testhal/STM32/STM32F3xx/SPI/mcuconf.h
similarity index 100%
rename from testhal/STM32/STM32F30x/SPI/mcuconf.h
rename to testhal/STM32/STM32F3xx/SPI/mcuconf.h
diff --git a/testhal/STM32/STM32F30x/SPI/readme.txt b/testhal/STM32/STM32F3xx/SPI/readme.txt
similarity index 100%
rename from testhal/STM32/STM32F30x/SPI/readme.txt
rename to testhal/STM32/STM32F3xx/SPI/readme.txt
diff --git a/testhal/STM32/STM32F30x/UART/.cproject b/testhal/STM32/STM32F3xx/UART/.cproject
similarity index 100%
rename from testhal/STM32/STM32F30x/UART/.cproject
rename to testhal/STM32/STM32F3xx/UART/.cproject
diff --git a/testhal/STM32/STM32F30x/UART/.project b/testhal/STM32/STM32F3xx/UART/.project
similarity index 100%
rename from testhal/STM32/STM32F30x/UART/.project
rename to testhal/STM32/STM32F3xx/UART/.project
diff --git a/testhal/STM32/STM32F30x/UART/Makefile b/testhal/STM32/STM32F3xx/UART/Makefile
similarity index 100%
rename from testhal/STM32/STM32F30x/UART/Makefile
rename to testhal/STM32/STM32F3xx/UART/Makefile
diff --git a/testhal/STM32/STM32F30x/UART/chconf.h b/testhal/STM32/STM32F3xx/UART/chconf.h
similarity index 100%
rename from testhal/STM32/STM32F30x/UART/chconf.h
rename to testhal/STM32/STM32F3xx/UART/chconf.h
diff --git a/testhal/STM32/STM32F30x/UART/halconf.h b/testhal/STM32/STM32F3xx/UART/halconf.h
similarity index 100%
rename from testhal/STM32/STM32F30x/UART/halconf.h
rename to testhal/STM32/STM32F3xx/UART/halconf.h
diff --git a/testhal/STM32/STM32F30x/UART/main.c b/testhal/STM32/STM32F3xx/UART/main.c
similarity index 100%
rename from testhal/STM32/STM32F30x/UART/main.c
rename to testhal/STM32/STM32F3xx/UART/main.c
diff --git a/testhal/STM32/STM32F30x/UART/mcuconf.h b/testhal/STM32/STM32F3xx/UART/mcuconf.h
similarity index 100%
rename from testhal/STM32/STM32F30x/UART/mcuconf.h
rename to testhal/STM32/STM32F3xx/UART/mcuconf.h
diff --git a/testhal/STM32/STM32F30x/UART/readme.txt b/testhal/STM32/STM32F3xx/UART/readme.txt
similarity index 100%
rename from testhal/STM32/STM32F30x/UART/readme.txt
rename to testhal/STM32/STM32F3xx/UART/readme.txt
diff --git a/testhal/STM32/STM32F30x/USB_CDC/.cproject b/testhal/STM32/STM32F3xx/USB_CDC/.cproject
similarity index 100%
rename from testhal/STM32/STM32F30x/USB_CDC/.cproject
rename to testhal/STM32/STM32F3xx/USB_CDC/.cproject
diff --git a/testhal/STM32/STM32F30x/USB_CDC/.project b/testhal/STM32/STM32F3xx/USB_CDC/.project
similarity index 100%
rename from testhal/STM32/STM32F30x/USB_CDC/.project
rename to testhal/STM32/STM32F3xx/USB_CDC/.project
diff --git a/testhal/STM32/STM32F30x/USB_CDC/Makefile b/testhal/STM32/STM32F3xx/USB_CDC/Makefile
similarity index 100%
rename from testhal/STM32/STM32F30x/USB_CDC/Makefile
rename to testhal/STM32/STM32F3xx/USB_CDC/Makefile
diff --git a/testhal/STM32/STM32F30x/USB_CDC/chconf.h b/testhal/STM32/STM32F3xx/USB_CDC/chconf.h
similarity index 100%
rename from testhal/STM32/STM32F30x/USB_CDC/chconf.h
rename to testhal/STM32/STM32F3xx/USB_CDC/chconf.h
diff --git a/testhal/STM32/STM32F30x/USB_CDC/debug/STM32F30x-USB_CDC (OpenOCD, Flash and Run).launch b/testhal/STM32/STM32F3xx/USB_CDC/debug/STM32F30x-USB_CDC (OpenOCD, Flash and Run).launch
similarity index 100%
rename from testhal/STM32/STM32F30x/USB_CDC/debug/STM32F30x-USB_CDC (OpenOCD, Flash and Run).launch
rename to testhal/STM32/STM32F3xx/USB_CDC/debug/STM32F30x-USB_CDC (OpenOCD, Flash and Run).launch
diff --git a/testhal/STM32/STM32F30x/USB_CDC/halconf.h b/testhal/STM32/STM32F3xx/USB_CDC/halconf.h
similarity index 100%
rename from testhal/STM32/STM32F30x/USB_CDC/halconf.h
rename to testhal/STM32/STM32F3xx/USB_CDC/halconf.h
diff --git a/testhal/STM32/STM32F30x/USB_CDC/main.c b/testhal/STM32/STM32F3xx/USB_CDC/main.c
similarity index 100%
rename from testhal/STM32/STM32F30x/USB_CDC/main.c
rename to testhal/STM32/STM32F3xx/USB_CDC/main.c
diff --git a/testhal/STM32/STM32F30x/USB_CDC/mcuconf.h b/testhal/STM32/STM32F3xx/USB_CDC/mcuconf.h
similarity index 100%
rename from testhal/STM32/STM32F30x/USB_CDC/mcuconf.h
rename to testhal/STM32/STM32F3xx/USB_CDC/mcuconf.h
diff --git a/testhal/STM32/STM32F30x/USB_CDC/readme.txt b/testhal/STM32/STM32F3xx/USB_CDC/readme.txt
similarity index 100%
rename from testhal/STM32/STM32F30x/USB_CDC/readme.txt
rename to testhal/STM32/STM32F3xx/USB_CDC/readme.txt
diff --git a/testhal/STM32/STM32F30x/USB_CDC_IAD/.cproject b/testhal/STM32/STM32F3xx/USB_CDC_IAD/.cproject
similarity index 100%
rename from testhal/STM32/STM32F30x/USB_CDC_IAD/.cproject
rename to testhal/STM32/STM32F3xx/USB_CDC_IAD/.cproject
diff --git a/testhal/STM32/STM32F30x/USB_CDC_IAD/.project b/testhal/STM32/STM32F3xx/USB_CDC_IAD/.project
similarity index 100%
rename from testhal/STM32/STM32F30x/USB_CDC_IAD/.project
rename to testhal/STM32/STM32F3xx/USB_CDC_IAD/.project
diff --git a/testhal/STM32/STM32F30x/USB_CDC_IAD/Makefile b/testhal/STM32/STM32F3xx/USB_CDC_IAD/Makefile
similarity index 100%
rename from testhal/STM32/STM32F30x/USB_CDC_IAD/Makefile
rename to testhal/STM32/STM32F3xx/USB_CDC_IAD/Makefile
diff --git a/testhal/STM32/STM32F30x/USB_CDC_IAD/chconf.h b/testhal/STM32/STM32F3xx/USB_CDC_IAD/chconf.h
similarity index 100%
rename from testhal/STM32/STM32F30x/USB_CDC_IAD/chconf.h
rename to testhal/STM32/STM32F3xx/USB_CDC_IAD/chconf.h
diff --git a/testhal/STM32/STM32F30x/USB_CDC_IAD/debug/STM32F30x-USB_CDC_IAD (OpenOCD, Flash and Run).launch b/testhal/STM32/STM32F3xx/USB_CDC_IAD/debug/STM32F30x-USB_CDC_IAD (OpenOCD, Flash and Run).launch
similarity index 100%
rename from testhal/STM32/STM32F30x/USB_CDC_IAD/debug/STM32F30x-USB_CDC_IAD (OpenOCD, Flash and Run).launch
rename to testhal/STM32/STM32F3xx/USB_CDC_IAD/debug/STM32F30x-USB_CDC_IAD (OpenOCD, Flash and Run).launch
diff --git a/testhal/STM32/STM32F30x/USB_CDC_IAD/driver/ChibiOS Virtual COM.inf b/testhal/STM32/STM32F3xx/USB_CDC_IAD/driver/ChibiOS Virtual COM.inf
similarity index 100%
rename from testhal/STM32/STM32F30x/USB_CDC_IAD/driver/ChibiOS Virtual COM.inf
rename to testhal/STM32/STM32F3xx/USB_CDC_IAD/driver/ChibiOS Virtual COM.inf
diff --git a/testhal/STM32/STM32F30x/USB_CDC_IAD/halconf.h b/testhal/STM32/STM32F3xx/USB_CDC_IAD/halconf.h
similarity index 100%
rename from testhal/STM32/STM32F30x/USB_CDC_IAD/halconf.h
rename to testhal/STM32/STM32F3xx/USB_CDC_IAD/halconf.h
diff --git a/testhal/STM32/STM32F30x/USB_CDC_IAD/main.c b/testhal/STM32/STM32F3xx/USB_CDC_IAD/main.c
similarity index 100%
rename from testhal/STM32/STM32F30x/USB_CDC_IAD/main.c
rename to testhal/STM32/STM32F3xx/USB_CDC_IAD/main.c
diff --git a/testhal/STM32/STM32F30x/USB_CDC_IAD/mcuconf.h b/testhal/STM32/STM32F3xx/USB_CDC_IAD/mcuconf.h
similarity index 100%
rename from testhal/STM32/STM32F30x/USB_CDC_IAD/mcuconf.h
rename to testhal/STM32/STM32F3xx/USB_CDC_IAD/mcuconf.h
diff --git a/testhal/STM32/STM32F30x/USB_CDC_IAD/readme.txt b/testhal/STM32/STM32F3xx/USB_CDC_IAD/readme.txt
similarity index 100%
rename from testhal/STM32/STM32F30x/USB_CDC_IAD/readme.txt
rename to testhal/STM32/STM32F3xx/USB_CDC_IAD/readme.txt
diff --git a/testhal/STM32/STM32F30x/USB_CDC_IAD/usbcfg.c b/testhal/STM32/STM32F3xx/USB_CDC_IAD/usbcfg.c
similarity index 100%
rename from testhal/STM32/STM32F30x/USB_CDC_IAD/usbcfg.c
rename to testhal/STM32/STM32F3xx/USB_CDC_IAD/usbcfg.c
diff --git a/testhal/STM32/STM32F30x/USB_CDC_IAD/usbcfg.h b/testhal/STM32/STM32F3xx/USB_CDC_IAD/usbcfg.h
similarity index 100%
rename from testhal/STM32/STM32F30x/USB_CDC_IAD/usbcfg.h
rename to testhal/STM32/STM32F3xx/USB_CDC_IAD/usbcfg.h