diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/device/stm32h743xx.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/CMSIS/stm32h743xx.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/device/stm32h743xx.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/CMSIS/stm32h743xx.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/device/stm32h745xx.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/CMSIS/stm32h745xx.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/device/stm32h745xx.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/CMSIS/stm32h745xx.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/device/stm32h747xx.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/CMSIS/stm32h747xx.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/device/stm32h747xx.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/CMSIS/stm32h747xx.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/CMSIS/stm32h7xx.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/CMSIS/stm32h7xx.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/system_stm32h7xx.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/CMSIS/system_stm32h7xx.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/system_stm32h7xx.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/CMSIS/system_stm32h7xx.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32_hal_legacy.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/Legacy/stm32_hal_legacy.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32_hal_legacy.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/Legacy/stm32_hal_legacy.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_adc.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_adc.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_adc.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_adc.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_adc.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_adc.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_adc.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_adc.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_adc_ex.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_adc_ex.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_adc_ex.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_adc_ex.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_adc_ex.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_adc_ex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_adc_ex.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_adc_ex.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_cec.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_cec.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_cec.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_cec.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_cec.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_cec.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_cec.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_cec.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_comp.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_comp.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_comp.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_comp.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_comp.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_comp.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_comp.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_comp.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_cortex.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_cortex.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_cortex.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_cortex.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_cortex.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_cortex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_cortex.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_cortex.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_crc.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_crc.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_crc.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_crc.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_crc.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_crc.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_crc.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_crc.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_crc_ex.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_crc_ex.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_crc_ex.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_crc_ex.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_crc_ex.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_crc_ex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_crc_ex.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_crc_ex.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_cryp.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_cryp.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_cryp.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_cryp.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_cryp.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_cryp.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_cryp.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_cryp.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_cryp_ex.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_cryp_ex.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_cryp_ex.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_cryp_ex.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_cryp_ex.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_cryp_ex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_cryp_ex.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_cryp_ex.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_dac.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_dac.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_dac.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_dac.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_dac.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_dac.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_dac.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_dac.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_dac_ex.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_dac_ex.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_dac_ex.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_dac_ex.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_dac_ex.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_dac_ex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_dac_ex.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_dac_ex.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_dcmi.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_dcmi.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_dcmi.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_dcmi.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_dcmi.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_dcmi.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_dcmi.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_dcmi.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_def.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_def.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_def.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_def.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_dfsdm.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_dfsdm.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_dfsdm.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_dfsdm.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_dfsdm.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_dfsdm.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_dfsdm.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_dfsdm.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_dma.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_dma.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_dma.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_dma.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_dma.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_dma.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_dma.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_dma.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_dma2d.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_dma2d.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_dma2d.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_dma2d.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_dma2d.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_dma2d.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_dma2d.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_dma2d.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_dma_ex.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_dma_ex.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_dma_ex.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_dma_ex.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_dma_ex.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_dma_ex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_dma_ex.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_dma_ex.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_dsi.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_dsi.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_dsi.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_dsi.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_dsi.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_dsi.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_dsi.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_dsi.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_eth.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_eth.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_eth.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_eth.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_eth.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_eth.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_eth.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_eth.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_eth_ex.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_eth_ex.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_eth_ex.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_eth_ex.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_eth_ex.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_eth_ex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_eth_ex.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_eth_ex.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_exti.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_exti.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_exti.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_exti.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_exti.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_exti.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_exti.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_exti.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_fdcan.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_fdcan.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_fdcan.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_fdcan.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_fdcan.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_fdcan.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_fdcan.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_fdcan.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_flash.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_flash.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_flash.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_flash.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_flash.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_flash.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_flash.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_flash.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_flash_ex.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_flash_ex.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_flash_ex.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_flash_ex.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_flash_ex.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_flash_ex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_flash_ex.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_flash_ex.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_gpio.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_gpio.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_gpio.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_gpio.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_gpio.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_gpio.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_gpio.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_gpio.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_gpio_ex.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_gpio_ex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_gpio_ex.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_gpio_ex.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_hash.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_hash.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_hash.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_hash.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_hash.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_hash.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_hash.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_hash.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_hash_ex.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_hash_ex.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_hash_ex.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_hash_ex.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_hash_ex.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_hash_ex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_hash_ex.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_hash_ex.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_hcd.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_hcd.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_hcd.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_hcd.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_hcd.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_hcd.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_hcd.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_hcd.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_hrtim.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_hrtim.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_hrtim.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_hrtim.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_hrtim.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_hrtim.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_hrtim.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_hrtim.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_hsem.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_hsem.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_hsem.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_hsem.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_hsem.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_hsem.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_hsem.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_hsem.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_i2c.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_i2c.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_i2c.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_i2c.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_i2c.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_i2c.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_i2c.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_i2c.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_i2c_ex.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_i2c_ex.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_i2c_ex.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_i2c_ex.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_i2c_ex.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_i2c_ex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_i2c_ex.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_i2c_ex.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_i2s.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_i2s.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_i2s.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_i2s.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_i2s.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_i2s.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_i2s.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_i2s.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_i2s_ex.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_i2s_ex.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_i2s_ex.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_i2s_ex.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_i2s_ex.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_i2s_ex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_i2s_ex.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_i2s_ex.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_irda.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_irda.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_irda.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_irda.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_irda.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_irda.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_irda.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_irda.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_irda_ex.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_irda_ex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_irda_ex.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_irda_ex.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_iwdg.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_iwdg.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_iwdg.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_iwdg.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_iwdg.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_iwdg.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_iwdg.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_iwdg.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_jpeg.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_jpeg.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_jpeg.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_jpeg.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_jpeg.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_jpeg.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_jpeg.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_jpeg.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_lptim.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_lptim.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_lptim.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_lptim.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_lptim.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_lptim.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_lptim.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_lptim.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_ltdc.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_ltdc.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_ltdc.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_ltdc.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_ltdc.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_ltdc.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_ltdc.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_ltdc.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_ltdc_ex.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_ltdc_ex.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_ltdc_ex.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_ltdc_ex.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_ltdc_ex.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_ltdc_ex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_ltdc_ex.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_ltdc_ex.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_mdios.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_mdios.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_mdios.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_mdios.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_mdios.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_mdios.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_mdios.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_mdios.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_mdma.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_mdma.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_mdma.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_mdma.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_mdma.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_mdma.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_mdma.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_mdma.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_mmc.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_mmc.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_mmc.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_mmc.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_mmc.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_mmc.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_mmc.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_mmc.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_mmc_ex.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_mmc_ex.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_mmc_ex.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_mmc_ex.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_mmc_ex.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_mmc_ex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_mmc_ex.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_mmc_ex.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_nand.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_nand.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_nand.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_nand.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_nand.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_nand.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_nand.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_nand.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_nor.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_nor.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_nor.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_nor.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_nor.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_nor.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_nor.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_nor.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_opamp.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_opamp.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_opamp.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_opamp.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_opamp.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_opamp.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_opamp.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_opamp.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_opamp_ex.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_opamp_ex.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_opamp_ex.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_opamp_ex.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_opamp_ex.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_opamp_ex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_opamp_ex.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_opamp_ex.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_pcd.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_pcd.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_pcd.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_pcd.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_pcd.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_pcd.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_pcd.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_pcd.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_pcd_ex.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_pcd_ex.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_pcd_ex.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_pcd_ex.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_pcd_ex.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_pcd_ex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_pcd_ex.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_pcd_ex.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_pwr.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_pwr.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_pwr.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_pwr.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_pwr.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_pwr.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_pwr.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_pwr.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_pwr_ex.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_pwr_ex.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_pwr_ex.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_pwr_ex.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_pwr_ex.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_pwr_ex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_pwr_ex.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_pwr_ex.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_qspi.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_qspi.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_qspi.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_qspi.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_qspi.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_qspi.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_qspi.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_qspi.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_ramecc.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_ramecc.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_ramecc.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_ramecc.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_ramecc.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_ramecc.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_ramecc.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_ramecc.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_rcc.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_rcc.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_rcc.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_rcc.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_rcc.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_rcc.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_rcc.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_rcc.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_rcc_ex.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_rcc_ex.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_rcc_ex.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_rcc_ex.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_rcc_ex.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_rcc_ex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_rcc_ex.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_rcc_ex.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_rng.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_rng.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_rng.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_rng.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_rng.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_rng.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_rng.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_rng.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_rtc.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_rtc.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_rtc.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_rtc.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_rtc.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_rtc.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_rtc.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_rtc.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_rtc_ex.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_rtc_ex.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_rtc_ex.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_rtc_ex.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_rtc_ex.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_rtc_ex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_rtc_ex.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_rtc_ex.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_sai.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_sai.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_sai.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_sai.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_sai.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_sai.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_sai.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_sai.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_sai_ex.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_sai_ex.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_sai_ex.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_sai_ex.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_sai_ex.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_sai_ex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_sai_ex.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_sai_ex.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_sd.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_sd.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_sd.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_sd.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_sd.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_sd.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_sd.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_sd.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_sd_ex.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_sd_ex.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_sd_ex.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_sd_ex.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_sd_ex.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_sd_ex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_sd_ex.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_sd_ex.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_sdram.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_sdram.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_sdram.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_sdram.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_sdram.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_sdram.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_sdram.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_sdram.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_smartcard.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_smartcard.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_smartcard.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_smartcard.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_smartcard.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_smartcard.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_smartcard.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_smartcard.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_smartcard_ex.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_smartcard_ex.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_smartcard_ex.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_smartcard_ex.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_smartcard_ex.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_smartcard_ex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_smartcard_ex.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_smartcard_ex.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_smbus.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_smbus.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_smbus.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_smbus.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_smbus.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_smbus.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_smbus.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_smbus.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_spdifrx.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_spdifrx.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_spdifrx.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_spdifrx.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_spdifrx.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_spdifrx.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_spdifrx.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_spdifrx.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_spi.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_spi.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_spi.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_spi.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_spi.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_spi.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_spi.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_spi.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_spi_ex.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_spi_ex.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_spi_ex.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_spi_ex.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_spi_ex.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_spi_ex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_spi_ex.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_spi_ex.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_sram.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_sram.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_sram.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_sram.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_sram.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_sram.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_sram.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_sram.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_swpmi.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_swpmi.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_swpmi.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_swpmi.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_swpmi.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_swpmi.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_swpmi.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_swpmi.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_tim.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_tim.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_tim.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_tim.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_tim.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_tim.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_tim.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_tim.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_tim_ex.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_tim_ex.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_tim_ex.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_tim_ex.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_tim_ex.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_tim_ex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_tim_ex.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_tim_ex.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_uart.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_uart.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_uart.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_uart.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_uart.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_uart.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_uart.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_uart.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_uart_ex.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_uart_ex.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_uart_ex.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_uart_ex.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_uart_ex.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_uart_ex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_uart_ex.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_uart_ex.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_usart.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_usart.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_usart.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_usart.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_usart.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_usart.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_usart.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_usart.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_usart_ex.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_usart_ex.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_usart_ex.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_usart_ex.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_usart_ex.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_usart_ex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_usart_ex.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_usart_ex.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_wwdg.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_wwdg.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_wwdg.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_wwdg.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_wwdg.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_wwdg.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_wwdg.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_hal_wwdg.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_adc.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_adc.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_adc.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_adc.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_adc.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_adc.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_adc.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_adc.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_bdma.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_bdma.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_bdma.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_bdma.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_bdma.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_bdma.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_bdma.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_bdma.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_bus.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_bus.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_bus.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_bus.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_comp.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_comp.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_comp.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_comp.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_comp.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_comp.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_comp.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_comp.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_cortex.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_cortex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_cortex.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_cortex.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_crc.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_crc.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_crc.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_crc.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_crc.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_crc.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_crc.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_crc.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_dac.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_dac.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_dac.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_dac.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_dac.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_dac.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_dac.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_dac.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_delayblock.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_delayblock.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_delayblock.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_delayblock.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_delayblock.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_delayblock.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_delayblock.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_delayblock.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_dma.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_dma.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_dma.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_dma.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_dma.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_dma.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_dma.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_dma.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_dma2d.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_dma2d.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_dma2d.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_dma2d.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_dma2d.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_dma2d.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_dma2d.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_dma2d.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_dmamux.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_dmamux.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_dmamux.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_dmamux.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_exti.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_exti.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_exti.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_exti.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_exti.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_exti.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_exti.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_exti.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_fmc.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_fmc.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_fmc.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_fmc.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_fmc.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_fmc.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_fmc.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_fmc.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_gpio.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_gpio.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_gpio.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_gpio.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_gpio.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_gpio.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_gpio.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_gpio.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_hrtim.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_hrtim.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_hrtim.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_hrtim.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_hrtim.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_hrtim.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_hrtim.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_hrtim.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_hsem.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_hsem.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_hsem.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_hsem.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_i2c.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_i2c.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_i2c.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_i2c.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_i2c.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_i2c.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_i2c.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_i2c.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_iwdg.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_iwdg.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_iwdg.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_iwdg.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_lptim.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_lptim.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_lptim.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_lptim.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_lptim.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_lptim.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_lptim.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_lptim.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_lpuart.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_lpuart.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_lpuart.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_lpuart.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_lpuart.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_lpuart.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_lpuart.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_lpuart.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_mdma.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_mdma.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_mdma.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_mdma.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_mdma.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_mdma.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_mdma.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_mdma.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_opamp.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_opamp.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_opamp.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_opamp.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_opamp.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_opamp.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_opamp.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_opamp.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_pwr.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_pwr.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_pwr.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_pwr.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_pwr.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_pwr.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_pwr.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_pwr.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_rcc.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_rcc.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_rcc.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_rcc.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_rcc.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_rcc.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_rcc.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_rcc.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_rng.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_rng.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_rng.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_rng.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_rng.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_rng.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_rng.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_rng.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_rtc.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_rtc.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_rtc.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_rtc.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_rtc.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_rtc.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_rtc.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_rtc.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_sdmmc.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_sdmmc.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_sdmmc.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_sdmmc.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_sdmmc.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_sdmmc.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_sdmmc.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_sdmmc.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_spi.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_spi.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_spi.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_spi.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_spi.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_spi.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_spi.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_spi.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_swpmi.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_swpmi.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_swpmi.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_swpmi.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_swpmi.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_swpmi.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_swpmi.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_swpmi.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_system.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_system.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_system.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_system.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_tim.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_tim.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_tim.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_tim.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_tim.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_tim.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_tim.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_tim.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_usart.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_usart.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_usart.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_usart.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_usart.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_usart.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_usart.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_usart.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_usb.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_usb.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_usb.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_usb.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_usb.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_usb.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_usb.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_usb.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_utils.c b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_utils.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_utils.c
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_utils.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_utils.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_utils.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_utils.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_utils.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_wwdg.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_wwdg.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_ll_wwdg.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/STM32H7xx_HAL_Driver/stm32h7xx_ll_wwdg.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_conf.h b/targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/stm32h7xx_hal_conf.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/device/stm32h7xx_hal_conf.h
rename to targets/TARGET_STM/TARGET_STM32H7/STM32Cube_FW/stm32h7xx_hal_conf.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/device/TOOLCHAIN_ARM/startup_stm32h743xx.S b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/TOOLCHAIN_ARM/startup_stm32h743xx.S
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/device/TOOLCHAIN_ARM/startup_stm32h743xx.S
rename to targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/TOOLCHAIN_ARM/startup_stm32h743xx.S
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/device/TOOLCHAIN_ARM/stm32h743xI.sct b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/TOOLCHAIN_ARM/stm32h743xI.sct
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/device/TOOLCHAIN_ARM/stm32h743xI.sct
rename to targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/TOOLCHAIN_ARM/stm32h743xI.sct
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/device/TOOLCHAIN_GCC_ARM/STM32H743xI.ld b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/TOOLCHAIN_GCC_ARM/STM32H743xI.ld
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/device/TOOLCHAIN_GCC_ARM/STM32H743xI.ld
rename to targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/TOOLCHAIN_GCC_ARM/STM32H743xI.ld
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/device/TOOLCHAIN_GCC_ARM/startup_stm32h743xx.S b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/TOOLCHAIN_GCC_ARM/startup_stm32h743xx.S
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/device/TOOLCHAIN_GCC_ARM/startup_stm32h743xx.S
rename to targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/TOOLCHAIN_GCC_ARM/startup_stm32h743xx.S
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/device/TOOLCHAIN_IAR/startup_stm32h743xx.S b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/TOOLCHAIN_IAR/startup_stm32h743xx.S
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/device/TOOLCHAIN_IAR/startup_stm32h743xx.S
rename to targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/TOOLCHAIN_IAR/startup_stm32h743xx.S
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/device/TOOLCHAIN_IAR/stm32h743xI.icf b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/TOOLCHAIN_IAR/stm32h743xI.icf
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/device/TOOLCHAIN_IAR/stm32h743xI.icf
rename to targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/TOOLCHAIN_IAR/stm32h743xI.icf
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/device/cmsis_nvic.h b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/cmsis_nvic.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/device/cmsis_nvic.h
rename to targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/cmsis_nvic.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/device/system_stm32h7xx.c b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/system_stm32h7xx.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/device/system_stm32h7xx.c
rename to targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H743xI/system_stm32h7xx.c
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_GENERIC_H745I/TARGET_GENERIC_H745I_CM4/TOOLCHAIN_ARM/startup_stm32h745xx.S b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_STM32H745xI_CM4/TOOLCHAIN_ARM/startup_stm32h745xx.S
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_GENERIC_H745I/TARGET_GENERIC_H745I_CM4/TOOLCHAIN_ARM/startup_stm32h745xx.S
rename to targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_STM32H745xI_CM4/TOOLCHAIN_ARM/startup_stm32h745xx.S
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_GENERIC_H745I/TARGET_GENERIC_H745I_CM4/TOOLCHAIN_ARM/stm32h745xI_CM4.sct b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_STM32H745xI_CM4/TOOLCHAIN_ARM/stm32h745xI_CM4.sct
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_GENERIC_H745I/TARGET_GENERIC_H745I_CM4/TOOLCHAIN_ARM/stm32h745xI_CM4.sct
rename to targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_STM32H745xI_CM4/TOOLCHAIN_ARM/stm32h745xI_CM4.sct
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_GENERIC_H745I/TARGET_GENERIC_H745I_CM4/TOOLCHAIN_GCC_ARM/STM32H745xI_CM4.ld b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_STM32H745xI_CM4/TOOLCHAIN_GCC_ARM/STM32H745xI_CM4.ld
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_GENERIC_H745I/TARGET_GENERIC_H745I_CM4/TOOLCHAIN_GCC_ARM/STM32H745xI_CM4.ld
rename to targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_STM32H745xI_CM4/TOOLCHAIN_GCC_ARM/STM32H745xI_CM4.ld
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_GENERIC_H745I/TARGET_GENERIC_H745I_CM4/TOOLCHAIN_GCC_ARM/startup_stm32h745xx.S b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_STM32H745xI_CM4/TOOLCHAIN_GCC_ARM/startup_stm32h745xx.S
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_GENERIC_H745I/TARGET_GENERIC_H745I_CM4/TOOLCHAIN_GCC_ARM/startup_stm32h745xx.S
rename to targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_STM32H745xI_CM4/TOOLCHAIN_GCC_ARM/startup_stm32h745xx.S
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_GENERIC_H745I/TARGET_GENERIC_H745I_CM4/TOOLCHAIN_IAR/startup_stm32h745xx.S b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_STM32H745xI_CM4/TOOLCHAIN_IAR/startup_stm32h745xx.S
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_GENERIC_H745I/TARGET_GENERIC_H745I_CM4/TOOLCHAIN_IAR/startup_stm32h745xx.S
rename to targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_STM32H745xI_CM4/TOOLCHAIN_IAR/startup_stm32h745xx.S
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_GENERIC_H745I/TARGET_GENERIC_H745I_CM4/TOOLCHAIN_IAR/stm32h745xI_CM4.icf b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_STM32H745xI_CM4/TOOLCHAIN_IAR/stm32h745xI_CM4.icf
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_GENERIC_H745I/TARGET_GENERIC_H745I_CM4/TOOLCHAIN_IAR/stm32h745xI_CM4.icf
rename to targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_STM32H745xI_CM4/TOOLCHAIN_IAR/stm32h745xI_CM4.icf
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_GENERIC_H745I/TARGET_GENERIC_H745I_CM4/cmsis_nvic.h b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_STM32H745xI_CM4/cmsis_nvic.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_GENERIC_H745I/TARGET_GENERIC_H745I_CM4/cmsis_nvic.h
rename to targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_STM32H745xI_CM4/cmsis_nvic.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_GENERIC_H745I/TARGET_GENERIC_H745I_CM7/TOOLCHAIN_ARM/startup_stm32h745xx.S b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_STM32H745xI_CM7/TOOLCHAIN_ARM/startup_stm32h745xx.S
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_GENERIC_H745I/TARGET_GENERIC_H745I_CM7/TOOLCHAIN_ARM/startup_stm32h745xx.S
rename to targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_STM32H745xI_CM7/TOOLCHAIN_ARM/startup_stm32h745xx.S
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_GENERIC_H745I/TARGET_GENERIC_H745I_CM7/TOOLCHAIN_ARM/stm32h745xI.sct b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_STM32H745xI_CM7/TOOLCHAIN_ARM/stm32h745xI_CM7.sct
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_GENERIC_H745I/TARGET_GENERIC_H745I_CM7/TOOLCHAIN_ARM/stm32h745xI.sct
rename to targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_STM32H745xI_CM7/TOOLCHAIN_ARM/stm32h745xI_CM7.sct
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_GENERIC_H745I/TARGET_GENERIC_H745I_CM7/TOOLCHAIN_GCC_ARM/STM32H745xI.ld b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_STM32H745xI_CM7/TOOLCHAIN_GCC_ARM/STM32H745xI_CM7.ld
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_GENERIC_H745I/TARGET_GENERIC_H745I_CM7/TOOLCHAIN_GCC_ARM/STM32H745xI.ld
rename to targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_STM32H745xI_CM7/TOOLCHAIN_GCC_ARM/STM32H745xI_CM7.ld
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_GENERIC_H745I/TARGET_GENERIC_H745I_CM7/TOOLCHAIN_GCC_ARM/startup_stm32h745xx.S b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_STM32H745xI_CM7/TOOLCHAIN_GCC_ARM/startup_stm32h745xx.S
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_GENERIC_H745I/TARGET_GENERIC_H745I_CM7/TOOLCHAIN_GCC_ARM/startup_stm32h745xx.S
rename to targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_STM32H745xI_CM7/TOOLCHAIN_GCC_ARM/startup_stm32h745xx.S
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_GENERIC_H745I/TARGET_GENERIC_H745I_CM7/TOOLCHAIN_IAR/startup_stm32h747xx.S b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_STM32H745xI_CM7/TOOLCHAIN_IAR/startup_stm32h745xx.S
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_GENERIC_H745I/TARGET_GENERIC_H745I_CM7/TOOLCHAIN_IAR/startup_stm32h747xx.S
rename to targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_STM32H745xI_CM7/TOOLCHAIN_IAR/startup_stm32h745xx.S
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_GENERIC_H745I/TARGET_GENERIC_H745I_CM7/TOOLCHAIN_IAR/stm32h747xI.icf b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_STM32H745xI_CM7/TOOLCHAIN_IAR/stm32h745xI_CM7.icf
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_GENERIC_H745I/TARGET_GENERIC_H745I_CM7/TOOLCHAIN_IAR/stm32h747xI.icf
rename to targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_STM32H745xI_CM7/TOOLCHAIN_IAR/stm32h745xI_CM7.icf
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_GENERIC_H745I/TARGET_GENERIC_H745I_CM7/cmsis_nvic.h b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_STM32H745xI_CM7/cmsis_nvic.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_GENERIC_H745I/TARGET_GENERIC_H745I_CM7/cmsis_nvic.h
rename to targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H745xI/TARGET_STM32H745xI_CM7/cmsis_nvic.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_DISCO_H747I_CM4/TOOLCHAIN_ARM/startup_stm32h747xx.S b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_STM32H747xI_CM4/TOOLCHAIN_ARM/startup_stm32h747xx.S
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_DISCO_H747I_CM4/TOOLCHAIN_ARM/startup_stm32h747xx.S
rename to targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_STM32H747xI_CM4/TOOLCHAIN_ARM/startup_stm32h747xx.S
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_DISCO_H747I_CM4/TOOLCHAIN_ARM/stm32h747xI_CM4.sct b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_STM32H747xI_CM4/TOOLCHAIN_ARM/stm32h747xI_CM4.sct
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_DISCO_H747I_CM4/TOOLCHAIN_ARM/stm32h747xI_CM4.sct
rename to targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_STM32H747xI_CM4/TOOLCHAIN_ARM/stm32h747xI_CM4.sct
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_DISCO_H747I_CM4/TOOLCHAIN_GCC_ARM/STM32H747xI_CM4.ld b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_STM32H747xI_CM4/TOOLCHAIN_GCC_ARM/STM32H747xI_CM4.ld
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_DISCO_H747I_CM4/TOOLCHAIN_GCC_ARM/STM32H747xI_CM4.ld
rename to targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_STM32H747xI_CM4/TOOLCHAIN_GCC_ARM/STM32H747xI_CM4.ld
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_DISCO_H747I_CM4/TOOLCHAIN_GCC_ARM/startup_stm32h747xx.S b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_STM32H747xI_CM4/TOOLCHAIN_GCC_ARM/startup_stm32h747xx.S
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_DISCO_H747I_CM4/TOOLCHAIN_GCC_ARM/startup_stm32h747xx.S
rename to targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_STM32H747xI_CM4/TOOLCHAIN_GCC_ARM/startup_stm32h747xx.S
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_DISCO_H747I_CM4/TOOLCHAIN_IAR/startup_stm32h747xx.S b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_STM32H747xI_CM4/TOOLCHAIN_IAR/startup_stm32h747xx.S
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_DISCO_H747I_CM4/TOOLCHAIN_IAR/startup_stm32h747xx.S
rename to targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_STM32H747xI_CM4/TOOLCHAIN_IAR/startup_stm32h747xx.S
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_DISCO_H747I_CM4/TOOLCHAIN_IAR/stm32h747xI_CM4.icf b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_STM32H747xI_CM4/TOOLCHAIN_IAR/stm32h747xI_CM4.icf
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_DISCO_H747I_CM4/TOOLCHAIN_IAR/stm32h747xI_CM4.icf
rename to targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_STM32H747xI_CM4/TOOLCHAIN_IAR/stm32h747xI_CM4.icf
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_DISCO_H747I_CM4/cmsis_nvic.h b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_STM32H747xI_CM4/cmsis_nvic.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_DISCO_H747I_CM4/cmsis_nvic.h
rename to targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_STM32H747xI_CM4/cmsis_nvic.h
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_DISCO_H747I_CM7/TOOLCHAIN_ARM/startup_stm32h747xx.S b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_STM32H747xI_CM7/TOOLCHAIN_ARM/startup_stm32h747xx.S
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_DISCO_H747I_CM7/TOOLCHAIN_ARM/startup_stm32h747xx.S
rename to targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_STM32H747xI_CM7/TOOLCHAIN_ARM/startup_stm32h747xx.S
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_DISCO_H747I_CM7/TOOLCHAIN_ARM/stm32h747xI.sct b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_STM32H747xI_CM7/TOOLCHAIN_ARM/stm32h747xI_CM7.sct
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_DISCO_H747I_CM7/TOOLCHAIN_ARM/stm32h747xI.sct
rename to targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_STM32H747xI_CM7/TOOLCHAIN_ARM/stm32h747xI_CM7.sct
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_DISCO_H747I_CM7/TOOLCHAIN_GCC_ARM/STM32H747xI.ld b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_STM32H747xI_CM7/TOOLCHAIN_GCC_ARM/STM32H747xI_CM7.ld
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_DISCO_H747I_CM7/TOOLCHAIN_GCC_ARM/STM32H747xI.ld
rename to targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_STM32H747xI_CM7/TOOLCHAIN_GCC_ARM/STM32H747xI_CM7.ld
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_DISCO_H747I_CM7/TOOLCHAIN_GCC_ARM/startup_stm32h747xx.S b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_STM32H747xI_CM7/TOOLCHAIN_GCC_ARM/startup_stm32h747xx.S
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_DISCO_H747I_CM7/TOOLCHAIN_GCC_ARM/startup_stm32h747xx.S
rename to targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_STM32H747xI_CM7/TOOLCHAIN_GCC_ARM/startup_stm32h747xx.S
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_DISCO_H747I_CM7/TOOLCHAIN_IAR/startup_stm32h747xx.S b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_STM32H747xI_CM7/TOOLCHAIN_IAR/startup_stm32h747xx.S
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_DISCO_H747I_CM7/TOOLCHAIN_IAR/startup_stm32h747xx.S
rename to targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_STM32H747xI_CM7/TOOLCHAIN_IAR/startup_stm32h747xx.S
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_DISCO_H747I_CM7/TOOLCHAIN_IAR/stm32h747xI.icf b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_STM32H747xI_CM7/TOOLCHAIN_IAR/stm32h747xI_CM7.icf
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_DISCO_H747I_CM7/TOOLCHAIN_IAR/stm32h747xI.icf
rename to targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_STM32H747xI_CM7/TOOLCHAIN_IAR/stm32h747xI_CM7.icf
diff --git a/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_DISCO_H747I_CM7/cmsis_nvic.h b/targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_STM32H747xI_CM7/cmsis_nvic.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_DISCO_H747I_CM7/cmsis_nvic.h
rename to targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_STM32H747xI_CM7/cmsis_nvic.h
diff --git a/targets/targets.json b/targets/targets.json
index 6e0b46d8bd..2184f0356d 100644
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -2894,7 +2894,7 @@
             "GENERIC_H745I"
         ]
     },
-    "DISCO_H747I": {
+    "DISCO_H747I_CM7": {
         "inherits": [
             "MCU_STM32"
         ],
@@ -2910,7 +2910,8 @@
         "extra_labels_add": [
             "STM32H7",
             "STM32H747xI",
-            "DISCO_H747I_CM7",
+            "STM32H747xI_CM7",
+            "DISCO_H747I",
             "MT25QL512"
         ],
         "config": {
@@ -2953,9 +2954,9 @@
         "device_name": "STM32H747XIHx",
         "bootloader_supported": true
     },
-    "DISCO_H747I_CM7": {
+    "DISCO_H747I": {
         "inherits": [
-            "DISCO_H747I"
+            "DISCO_H747I_CM7"
         ]
     },
     "DISCO_H747I_CM4": {
@@ -2966,6 +2967,7 @@
         "extra_labels_add": [
             "STM32H7",
             "STM32H747xI",
+            "STM32H747xI_CM4",
             "DISCO_H747I",
             "MT25QL512"
         ],