diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32_hal_legacy.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/Legacy/stm32_hal_legacy.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32_hal_legacy.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/Legacy/stm32_hal_legacy.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_adc.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_adc.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_adc.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_adc.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_adc.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_adc.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_adc.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_adc.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_adc_ex.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_adc_ex.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_adc_ex.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_adc_ex.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_adc_ex.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_adc_ex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_adc_ex.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_adc_ex.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_cec.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_cec.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_cec.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_cec.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_cec.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_cec.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_cec.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_cec.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_comp.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_comp.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_comp.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_comp.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_comp.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_comp.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_comp.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_comp.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_cortex.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_cortex.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_cortex.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_cortex.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_cortex.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_cortex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_cortex.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_cortex.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_crc.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_crc.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_crc.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_crc.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_crc.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_crc.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_crc.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_crc.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_crc_ex.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_crc_ex.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_crc_ex.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_crc_ex.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_crc_ex.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_crc_ex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_crc_ex.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_crc_ex.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_cryp.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_cryp.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_cryp.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_cryp.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_cryp.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_cryp.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_cryp.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_cryp.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_cryp_ex.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_cryp_ex.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_cryp_ex.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_cryp_ex.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_cryp_ex.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_cryp_ex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_cryp_ex.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_cryp_ex.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_dac.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_dac.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_dac.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_dac.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_dac.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_dac.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_dac.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_dac.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_dac_ex.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_dac_ex.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_dac_ex.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_dac_ex.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_dac_ex.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_dac_ex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_dac_ex.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_dac_ex.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_def.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_def.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_def.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_def.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_dma.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_dma.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_dma.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_dma.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_dma.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_dma.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_dma.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_dma.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_dma_ex.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_dma_ex.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_dma_ex.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_dma_ex.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_dma_ex.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_dma_ex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_dma_ex.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_dma_ex.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_exti.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_exti.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_exti.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_exti.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_exti.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_exti.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_exti.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_exti.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_flash.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_flash.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_flash.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_flash.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_flash.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_flash.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_flash.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_flash.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_flash_ex.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_flash_ex.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_flash_ex.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_flash_ex.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_flash_ex.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_flash_ex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_flash_ex.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_flash_ex.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_gpio.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_gpio.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_gpio.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_gpio.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_gpio.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_gpio.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_gpio.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_gpio.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_gpio_ex.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_gpio_ex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_gpio_ex.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_gpio_ex.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_i2c.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_i2c.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_i2c.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_i2c.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_i2c.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_i2c.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_i2c.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_i2c.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_i2c_ex.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_i2c_ex.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_i2c_ex.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_i2c_ex.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_i2c_ex.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_i2c_ex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_i2c_ex.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_i2c_ex.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_i2s.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_i2s.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_i2s.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_i2s.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_i2s.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_i2s.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_i2s.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_i2s.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_irda.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_irda.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_irda.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_irda.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_irda.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_irda.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_irda.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_irda.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_irda_ex.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_irda_ex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_irda_ex.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_irda_ex.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_iwdg.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_iwdg.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_iwdg.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_iwdg.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_iwdg.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_iwdg.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_iwdg.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_iwdg.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_lptim.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_lptim.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_lptim.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_lptim.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_lptim.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_lptim.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_lptim.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_lptim.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_pwr.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_pwr.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_pwr.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_pwr.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_pwr.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_pwr.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_pwr.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_pwr.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_pwr_ex.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_pwr_ex.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_pwr_ex.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_pwr_ex.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_pwr_ex.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_pwr_ex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_pwr_ex.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_pwr_ex.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_rcc.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_rcc.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_rcc.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_rcc.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_rcc.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_rcc.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_rcc.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_rcc.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_rcc_ex.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_rcc_ex.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_rcc_ex.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_rcc_ex.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_rcc_ex.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_rcc_ex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_rcc_ex.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_rcc_ex.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_rng.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_rng.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_rng.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_rng.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_rng.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_rng.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_rng.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_rng.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_rtc.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_rtc.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_rtc.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_rtc.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_rtc.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_rtc.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_rtc.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_rtc.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_rtc_ex.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_rtc_ex.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_rtc_ex.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_rtc_ex.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_rtc_ex.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_rtc_ex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_rtc_ex.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_rtc_ex.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_smartcard.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_smartcard.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_smartcard.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_smartcard.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_smartcard.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_smartcard.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_smartcard.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_smartcard.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_smartcard_ex.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_smartcard_ex.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_smartcard_ex.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_smartcard_ex.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_smartcard_ex.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_smartcard_ex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_smartcard_ex.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_smartcard_ex.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_smbus.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_smbus.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_smbus.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_smbus.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_smbus.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_smbus.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_smbus.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_smbus.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_spi.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_spi.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_spi.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_spi.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_spi.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_spi.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_spi.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_spi.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_spi_ex.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_spi_ex.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_spi_ex.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_spi_ex.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_spi_ex.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_spi_ex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_spi_ex.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_spi_ex.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_tim.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_tim.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_tim.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_tim.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_tim.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_tim.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_tim.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_tim.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_tim_ex.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_tim_ex.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_tim_ex.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_tim_ex.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_tim_ex.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_tim_ex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_tim_ex.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_tim_ex.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_uart.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_uart.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_uart.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_uart.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_uart.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_uart.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_uart.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_uart.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_uart_ex.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_uart_ex.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_uart_ex.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_uart_ex.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_uart_ex.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_uart_ex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_uart_ex.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_uart_ex.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_usart.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_usart.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_usart.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_usart.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_usart.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_usart.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_usart.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_usart.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_usart_ex.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_usart_ex.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_usart_ex.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_usart_ex.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_usart_ex.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_usart_ex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_usart_ex.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_usart_ex.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_wwdg.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_wwdg.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_wwdg.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_wwdg.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_wwdg.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_wwdg.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_hal_wwdg.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_hal_wwdg.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_adc.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_adc.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_adc.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_adc.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_adc.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_adc.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_adc.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_adc.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_bus.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_bus.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_bus.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_bus.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_comp.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_comp.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_comp.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_comp.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_comp.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_comp.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_comp.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_comp.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_cortex.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_cortex.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_cortex.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_cortex.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_crc.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_crc.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_crc.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_crc.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_crc.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_crc.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_crc.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_crc.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_dac.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_dac.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_dac.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_dac.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_dac.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_dac.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_dac.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_dac.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_dma.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_dma.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_dma.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_dma.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_dma.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_dma.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_dma.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_dma.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_dmamux.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_dmamux.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_dmamux.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_dmamux.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_exti.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_exti.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_exti.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_exti.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_exti.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_exti.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_exti.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_exti.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_gpio.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_gpio.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_gpio.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_gpio.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_gpio.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_gpio.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_gpio.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_gpio.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_i2c.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_i2c.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_i2c.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_i2c.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_i2c.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_i2c.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_i2c.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_i2c.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_iwdg.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_iwdg.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_iwdg.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_iwdg.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_lptim.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_lptim.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_lptim.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_lptim.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_lptim.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_lptim.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_lptim.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_lptim.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_lpuart.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_lpuart.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_lpuart.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_lpuart.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_lpuart.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_lpuart.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_lpuart.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_lpuart.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_pwr.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_pwr.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_pwr.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_pwr.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_pwr.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_pwr.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_pwr.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_pwr.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_rcc.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_rcc.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_rcc.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_rcc.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_rcc.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_rcc.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_rcc.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_rcc.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_rng.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_rng.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_rng.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_rng.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_rng.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_rng.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_rng.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_rng.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_rtc.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_rtc.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_rtc.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_rtc.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_rtc.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_rtc.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_rtc.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_rtc.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_spi.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_spi.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_spi.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_spi.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_spi.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_spi.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_spi.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_spi.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_system.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_system.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_system.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_system.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_tim.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_tim.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_tim.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_tim.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_tim.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_tim.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_tim.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_tim.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_ucpd.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_ucpd.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_ucpd.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_ucpd.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_ucpd.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_ucpd.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_ucpd.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_ucpd.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_usart.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_usart.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_usart.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_usart.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_usart.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_usart.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_usart.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_usart.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_utils.c b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_utils.c
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_utils.c
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_utils.c
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_utils.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_utils.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_utils.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_utils.h
diff --git a/targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_wwdg.h b/targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_wwdg.h
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/device/stm32g0xx_ll_wwdg.h
rename to targets/TARGET_STM/TARGET_STM32G0/STM32Cube_FW/STM32G0xx_HAL_Driver/stm32g0xx_ll_wwdg.h