diff --git a/targets/TARGET_STM/TARGET_STM32G0/TARGET_STM32G071xx/device/TOOLCHAIN_ARM_STD/startup_stm32g071xx.S b/targets/TARGET_STM/TARGET_STM32G0/TARGET_STM32G071xx/TOOLCHAIN_ARM_STD/startup_stm32g071xx.S
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/TARGET_STM32G071xx/device/TOOLCHAIN_ARM_STD/startup_stm32g071xx.S
rename to targets/TARGET_STM/TARGET_STM32G0/TARGET_STM32G071xx/TOOLCHAIN_ARM_STD/startup_stm32g071xx.S
diff --git a/targets/TARGET_STM/TARGET_STM32G0/TARGET_STM32G071xx/device/TOOLCHAIN_ARM_STD/stm32g071xx.sct b/targets/TARGET_STM/TARGET_STM32G0/TARGET_STM32G071xx/TOOLCHAIN_ARM_STD/stm32g071xx.sct
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/TARGET_STM32G071xx/device/TOOLCHAIN_ARM_STD/stm32g071xx.sct
rename to targets/TARGET_STM/TARGET_STM32G0/TARGET_STM32G071xx/TOOLCHAIN_ARM_STD/stm32g071xx.sct
diff --git a/targets/TARGET_STM/TARGET_STM32G0/TARGET_STM32G071xx/device/TOOLCHAIN_GCC_ARM/startup_stm32g071xx.S b/targets/TARGET_STM/TARGET_STM32G0/TARGET_STM32G071xx/TOOLCHAIN_GCC_ARM/startup_stm32g071xx.S
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/TARGET_STM32G071xx/device/TOOLCHAIN_GCC_ARM/startup_stm32g071xx.S
rename to targets/TARGET_STM/TARGET_STM32G0/TARGET_STM32G071xx/TOOLCHAIN_GCC_ARM/startup_stm32g071xx.S
diff --git a/targets/TARGET_STM/TARGET_STM32G0/TARGET_STM32G071xx/device/TOOLCHAIN_GCC_ARM/STM32G071RBTx.ld b/targets/TARGET_STM/TARGET_STM32G0/TARGET_STM32G071xx/TOOLCHAIN_GCC_ARM/stm32g071xx.ld
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/TARGET_STM32G071xx/device/TOOLCHAIN_GCC_ARM/STM32G071RBTx.ld
rename to targets/TARGET_STM/TARGET_STM32G0/TARGET_STM32G071xx/TOOLCHAIN_GCC_ARM/stm32g071xx.ld
diff --git a/targets/TARGET_STM/TARGET_STM32G0/TARGET_STM32G071xx/device/TOOLCHAIN_IAR/startup_stm32g071xx.S b/targets/TARGET_STM/TARGET_STM32G0/TARGET_STM32G071xx/TOOLCHAIN_IAR/startup_stm32g071xx.S
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/TARGET_STM32G071xx/device/TOOLCHAIN_IAR/startup_stm32g071xx.S
rename to targets/TARGET_STM/TARGET_STM32G0/TARGET_STM32G071xx/TOOLCHAIN_IAR/startup_stm32g071xx.S
diff --git a/targets/TARGET_STM/TARGET_STM32G0/TARGET_STM32G071xx/device/TOOLCHAIN_IAR/stm32g071xx.icf b/targets/TARGET_STM/TARGET_STM32G0/TARGET_STM32G071xx/TOOLCHAIN_IAR/stm32g071xx.icf
similarity index 100%
rename from targets/TARGET_STM/TARGET_STM32G0/TARGET_STM32G071xx/device/TOOLCHAIN_IAR/stm32g071xx.icf
rename to targets/TARGET_STM/TARGET_STM32G0/TARGET_STM32G071xx/TOOLCHAIN_IAR/stm32g071xx.icf