diff --git a/libraries/SrcWrapper/keywords.txt b/libraries/SrcWrapper/keywords.txt
new file mode 100644
index 0000000000..8c790f63e5
--- /dev/null
+++ b/libraries/SrcWrapper/keywords.txt
@@ -0,0 +1,15 @@
+#######################################
+# Syntax Coloring Map For SrcWrapper
+#######################################
+
+#######################################
+# Datatypes (KEYWORD1)
+#######################################
+
+#######################################
+# Methods and Functions (KEYWORD2)
+#######################################
+
+#######################################
+# Constants (LITERAL1)
+#######################################
diff --git a/libraries/SrcWrapper/library.properties b/libraries/SrcWrapper/library.properties
new file mode 100644
index 0000000000..6d37361ff1
--- /dev/null
+++ b/libraries/SrcWrapper/library.properties
@@ -0,0 +1,9 @@
+name=Source Wrapper
+version=1.0.0
+author=Frederic Pillon
+maintainer=stm32duino
+sentence=Source files wrapper (HAL, LL,...)
+paragraph=Allow to not archive source object files to core.a. This avoid the linker to select weak definitions instead of non-weak ones when 'whole-archive' option is not used.
+category=Other
+url=
+architectures=stm32
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_adc.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_adc.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_adc.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_adc.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_adc_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_adc_ex.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_adc_ex.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_adc_ex.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_can.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_can.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_can.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_can.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_cec.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_cec.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_cec.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_cec.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_comp.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_comp.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_comp.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_comp.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_comp_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_comp_ex.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_comp_ex.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_comp_ex.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_cordic.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_cordic.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_cordic.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_cordic.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_cortex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_cortex.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_cortex.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_cortex.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_crc.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_crc.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_crc.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_crc.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_crc_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_crc_ex.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_crc_ex.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_crc_ex.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_cryp.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_cryp.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_cryp.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_cryp.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_cryp_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_cryp_ex.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_cryp_ex.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_cryp_ex.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_dac.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dac.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_dac.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dac.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_dac_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dac_ex.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_dac_ex.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dac_ex.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_dcmi.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dcmi.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_dcmi.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dcmi.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_dcmi_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dcmi_ex.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_dcmi_ex.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dcmi_ex.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_dfsdm.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dfsdm.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_dfsdm.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dfsdm.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_dfsdm_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dfsdm_ex.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_dfsdm_ex.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dfsdm_ex.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_dma.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dma.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_dma.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dma.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_dma2d.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dma2d.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_dma2d.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dma2d.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_dma_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dma_ex.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_dma_ex.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dma_ex.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_dsi.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dsi.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_dsi.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dsi.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_eth.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_eth.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_eth.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_eth.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_eth_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_eth_ex.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_eth_ex.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_eth_ex.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_exti.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_exti.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_exti.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_exti.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_fdcan.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_fdcan.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_fdcan.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_fdcan.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_firewall.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_firewall.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_firewall.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_firewall.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_flash.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_flash.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_flash.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_flash.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_flash_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_flash_ex.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_flash_ex.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_flash_ex.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_flash_ramfunc.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_flash_ramfunc.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_flash_ramfunc.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_flash_ramfunc.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_fmac.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_fmac.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_fmac.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_fmac.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_fmpi2c.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_fmpi2c.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_fmpi2c.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_fmpi2c.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_fmpi2c_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_fmpi2c_ex.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_fmpi2c_ex.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_fmpi2c_ex.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_gfxmmu.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_gfxmmu.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_gfxmmu.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_gfxmmu.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_gpio.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_gpio.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_gpio.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_gpio.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_gpio_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_gpio_ex.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_gpio_ex.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_gpio_ex.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_hash.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_hash.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_hash.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_hash.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_hash_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_hash_ex.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_hash_ex.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_hash_ex.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_hcd.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_hcd.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_hcd.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_hcd.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_hrtim.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_hrtim.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_hrtim.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_hrtim.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_hsem.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_hsem.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_hsem.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_hsem.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_i2c.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_i2c.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_i2c.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_i2c.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_i2c_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_i2c_ex.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_i2c_ex.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_i2c_ex.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_i2s.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_i2s.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_i2s.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_i2s.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_i2s_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_i2s_ex.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_i2s_ex.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_i2s_ex.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_ipcc.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_ipcc.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_ipcc.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_ipcc.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_irda.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_irda.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_irda.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_irda.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_iwdg.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_iwdg.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_iwdg.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_iwdg.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_jpeg.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_jpeg.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_jpeg.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_jpeg.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_lcd.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_lcd.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_lcd.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_lcd.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_lptim.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_lptim.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_lptim.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_lptim.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_ltdc.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_ltdc.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_ltdc.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_ltdc.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_ltdc_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_ltdc_ex.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_ltdc_ex.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_ltdc_ex.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_mdios.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_mdios.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_mdios.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_mdios.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_mdma.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_mdma.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_mdma.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_mdma.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_mmc.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_mmc.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_mmc.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_mmc.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_mmc_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_mmc_ex.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_mmc_ex.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_mmc_ex.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_msp_template.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_msp_template.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_msp_template.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_msp_template.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_nand.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_nand.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_nand.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_nand.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_nor.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_nor.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_nor.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_nor.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_opamp.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_opamp.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_opamp.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_opamp.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_opamp_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_opamp_ex.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_opamp_ex.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_opamp_ex.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_ospi.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_ospi.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_ospi.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_ospi.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_pccard.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pccard.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_pccard.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pccard.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_pcd.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pcd.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_pcd.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pcd.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_pcd_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pcd_ex.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_pcd_ex.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pcd_ex.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_pka.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pka.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_pka.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pka.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_pwr.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pwr.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_pwr.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pwr.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_pwr_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pwr_ex.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_pwr_ex.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_pwr_ex.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_qspi.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_qspi.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_qspi.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_qspi.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_ramecc.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_ramecc.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_ramecc.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_ramecc.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_rcc.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_rcc.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_rcc.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_rcc.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_rcc_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_rcc_ex.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_rcc_ex.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_rcc_ex.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_rng.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_rng.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_rng.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_rng.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_rtc.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_rtc.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_rtc.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_rtc.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_rtc_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_rtc_ex.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_rtc_ex.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_rtc_ex.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_sai.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_sai.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_sai.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_sai.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_sai_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_sai_ex.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_sai_ex.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_sai_ex.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_sd.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_sd.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_sd.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_sd.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_sd_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_sd_ex.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_sd_ex.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_sd_ex.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_sdadc.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_sdadc.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_sdadc.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_sdadc.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_sdram.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_sdram.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_sdram.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_sdram.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_smartcard.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_smartcard.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_smartcard.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_smartcard.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_smartcard_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_smartcard_ex.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_smartcard_ex.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_smartcard_ex.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_smbus.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_smbus.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_smbus.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_smbus.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_spdifrx.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_spdifrx.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_spdifrx.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_spdifrx.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_spi.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_spi.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_spi.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_spi.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_spi_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_spi_ex.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_spi_ex.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_spi_ex.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_sram.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_sram.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_sram.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_sram.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_swpmi.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_swpmi.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_swpmi.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_swpmi.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_tim.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_tim.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_tim.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_tim.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_tim_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_tim_ex.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_tim_ex.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_tim_ex.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_timebase_rtc_alarm_template.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_timebase_rtc_alarm_template.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_timebase_rtc_alarm_template.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_timebase_rtc_alarm_template.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_timebase_rtc_wakeup_template.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_timebase_rtc_wakeup_template.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_timebase_rtc_wakeup_template.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_timebase_rtc_wakeup_template.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_timebase_tim_template.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_timebase_tim_template.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_timebase_tim_template.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_timebase_tim_template.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_tsc.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_tsc.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_tsc.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_tsc.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_uart.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_uart.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_uart.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_uart.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_uart_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_uart_ex.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_uart_ex.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_uart_ex.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_usart.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_usart.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_usart.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_usart.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_usart_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_usart_ex.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_usart_ex.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_usart_ex.c
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_wwdg.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_wwdg.c
similarity index 100%
rename from cores/arduino/stm32/HAL/stm32yyxx_hal_wwdg.c
rename to libraries/SrcWrapper/src/HAL/stm32yyxx_hal_wwdg.c
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_adc.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_adc.c
similarity index 100%
rename from cores/arduino/stm32/LL/stm32yyxx_ll_adc.c
rename to libraries/SrcWrapper/src/LL/stm32yyxx_ll_adc.c
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_bdma.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_bdma.c
similarity index 100%
rename from cores/arduino/stm32/LL/stm32yyxx_ll_bdma.c
rename to libraries/SrcWrapper/src/LL/stm32yyxx_ll_bdma.c
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_comp.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_comp.c
similarity index 100%
rename from cores/arduino/stm32/LL/stm32yyxx_ll_comp.c
rename to libraries/SrcWrapper/src/LL/stm32yyxx_ll_comp.c
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_cordic.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_cordic.c
similarity index 100%
rename from cores/arduino/stm32/LL/stm32yyxx_ll_cordic.c
rename to libraries/SrcWrapper/src/LL/stm32yyxx_ll_cordic.c
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_crc.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_crc.c
similarity index 100%
rename from cores/arduino/stm32/LL/stm32yyxx_ll_crc.c
rename to libraries/SrcWrapper/src/LL/stm32yyxx_ll_crc.c
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_crs.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_crs.c
similarity index 100%
rename from cores/arduino/stm32/LL/stm32yyxx_ll_crs.c
rename to libraries/SrcWrapper/src/LL/stm32yyxx_ll_crs.c
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_dac.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_dac.c
similarity index 100%
rename from cores/arduino/stm32/LL/stm32yyxx_ll_dac.c
rename to libraries/SrcWrapper/src/LL/stm32yyxx_ll_dac.c
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_delayblock.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_delayblock.c
similarity index 100%
rename from cores/arduino/stm32/LL/stm32yyxx_ll_delayblock.c
rename to libraries/SrcWrapper/src/LL/stm32yyxx_ll_delayblock.c
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_dma.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_dma.c
similarity index 100%
rename from cores/arduino/stm32/LL/stm32yyxx_ll_dma.c
rename to libraries/SrcWrapper/src/LL/stm32yyxx_ll_dma.c
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_dma2d.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_dma2d.c
similarity index 100%
rename from cores/arduino/stm32/LL/stm32yyxx_ll_dma2d.c
rename to libraries/SrcWrapper/src/LL/stm32yyxx_ll_dma2d.c
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_exti.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_exti.c
similarity index 100%
rename from cores/arduino/stm32/LL/stm32yyxx_ll_exti.c
rename to libraries/SrcWrapper/src/LL/stm32yyxx_ll_exti.c
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_fmac.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_fmac.c
similarity index 100%
rename from cores/arduino/stm32/LL/stm32yyxx_ll_fmac.c
rename to libraries/SrcWrapper/src/LL/stm32yyxx_ll_fmac.c
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_fmc.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_fmc.c
similarity index 100%
rename from cores/arduino/stm32/LL/stm32yyxx_ll_fmc.c
rename to libraries/SrcWrapper/src/LL/stm32yyxx_ll_fmc.c
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_fsmc.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_fsmc.c
similarity index 100%
rename from cores/arduino/stm32/LL/stm32yyxx_ll_fsmc.c
rename to libraries/SrcWrapper/src/LL/stm32yyxx_ll_fsmc.c
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_gpio.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_gpio.c
similarity index 100%
rename from cores/arduino/stm32/LL/stm32yyxx_ll_gpio.c
rename to libraries/SrcWrapper/src/LL/stm32yyxx_ll_gpio.c
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_hrtim.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_hrtim.c
similarity index 100%
rename from cores/arduino/stm32/LL/stm32yyxx_ll_hrtim.c
rename to libraries/SrcWrapper/src/LL/stm32yyxx_ll_hrtim.c
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_i2c.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_i2c.c
similarity index 100%
rename from cores/arduino/stm32/LL/stm32yyxx_ll_i2c.c
rename to libraries/SrcWrapper/src/LL/stm32yyxx_ll_i2c.c
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_lptim.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_lptim.c
similarity index 100%
rename from cores/arduino/stm32/LL/stm32yyxx_ll_lptim.c
rename to libraries/SrcWrapper/src/LL/stm32yyxx_ll_lptim.c
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_lpuart.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_lpuart.c
similarity index 100%
rename from cores/arduino/stm32/LL/stm32yyxx_ll_lpuart.c
rename to libraries/SrcWrapper/src/LL/stm32yyxx_ll_lpuart.c
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_mdma.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_mdma.c
similarity index 100%
rename from cores/arduino/stm32/LL/stm32yyxx_ll_mdma.c
rename to libraries/SrcWrapper/src/LL/stm32yyxx_ll_mdma.c
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_opamp.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_opamp.c
similarity index 100%
rename from cores/arduino/stm32/LL/stm32yyxx_ll_opamp.c
rename to libraries/SrcWrapper/src/LL/stm32yyxx_ll_opamp.c
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_pka.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_pka.c
similarity index 100%
rename from cores/arduino/stm32/LL/stm32yyxx_ll_pka.c
rename to libraries/SrcWrapper/src/LL/stm32yyxx_ll_pka.c
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_pwr.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_pwr.c
similarity index 100%
rename from cores/arduino/stm32/LL/stm32yyxx_ll_pwr.c
rename to libraries/SrcWrapper/src/LL/stm32yyxx_ll_pwr.c
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_rcc.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_rcc.c
similarity index 100%
rename from cores/arduino/stm32/LL/stm32yyxx_ll_rcc.c
rename to libraries/SrcWrapper/src/LL/stm32yyxx_ll_rcc.c
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_rng.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_rng.c
similarity index 100%
rename from cores/arduino/stm32/LL/stm32yyxx_ll_rng.c
rename to libraries/SrcWrapper/src/LL/stm32yyxx_ll_rng.c
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_rtc.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_rtc.c
similarity index 100%
rename from cores/arduino/stm32/LL/stm32yyxx_ll_rtc.c
rename to libraries/SrcWrapper/src/LL/stm32yyxx_ll_rtc.c
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_sdmmc.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_sdmmc.c
similarity index 100%
rename from cores/arduino/stm32/LL/stm32yyxx_ll_sdmmc.c
rename to libraries/SrcWrapper/src/LL/stm32yyxx_ll_sdmmc.c
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_spi.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_spi.c
similarity index 100%
rename from cores/arduino/stm32/LL/stm32yyxx_ll_spi.c
rename to libraries/SrcWrapper/src/LL/stm32yyxx_ll_spi.c
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_swpmi.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_swpmi.c
similarity index 100%
rename from cores/arduino/stm32/LL/stm32yyxx_ll_swpmi.c
rename to libraries/SrcWrapper/src/LL/stm32yyxx_ll_swpmi.c
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_tim.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_tim.c
similarity index 100%
rename from cores/arduino/stm32/LL/stm32yyxx_ll_tim.c
rename to libraries/SrcWrapper/src/LL/stm32yyxx_ll_tim.c
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_ucpd.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_ucpd.c
similarity index 100%
rename from cores/arduino/stm32/LL/stm32yyxx_ll_ucpd.c
rename to libraries/SrcWrapper/src/LL/stm32yyxx_ll_ucpd.c
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_usart.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_usart.c
similarity index 100%
rename from cores/arduino/stm32/LL/stm32yyxx_ll_usart.c
rename to libraries/SrcWrapper/src/LL/stm32yyxx_ll_usart.c
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_usb.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_usb.c
similarity index 100%
rename from cores/arduino/stm32/LL/stm32yyxx_ll_usb.c
rename to libraries/SrcWrapper/src/LL/stm32yyxx_ll_usb.c
diff --git a/cores/arduino/stm32/LL/stm32yyxx_ll_utils.c b/libraries/SrcWrapper/src/LL/stm32yyxx_ll_utils.c
similarity index 100%
rename from cores/arduino/stm32/LL/stm32yyxx_ll_utils.c
rename to libraries/SrcWrapper/src/LL/stm32yyxx_ll_utils.c
diff --git a/libraries/SrcWrapper/src/SrcWrapper.h b/libraries/SrcWrapper/src/SrcWrapper.h
new file mode 100644
index 0000000000..e49d68a6d7
--- /dev/null
+++ b/libraries/SrcWrapper/src/SrcWrapper.h
@@ -0,0 +1,4 @@
+#ifndef __SRCWRAPPER_H__
+#define __SRCWRAPPER_H__
+
+#endif /* __SRCWRAPPER_H__ */
diff --git a/cores/arduino/syscalls.c b/libraries/SrcWrapper/src/syscalls.c
similarity index 100%
rename from cores/arduino/syscalls.c
rename to libraries/SrcWrapper/src/syscalls.c
diff --git a/platform.txt b/platform.txt
index a6e8ed9640..bb15f181a9 100644
--- a/platform.txt
+++ b/platform.txt
@@ -9,7 +9,7 @@ version=1.0.0
 
 # STM compile variables
 # ----------------------
-compiler.stm.extra_include="-I{build.source.path}" "-I{build.core.path}/avr" "-I{build.core.path}/stm32" "-I{build.core.path}/stm32/LL" "-I{build.core.path}/stm32/usb" "-I{build.core.path}/stm32/usb/hid" "-I{build.core.path}/stm32/usb/cdc" "-I{build.system.path}/Drivers/{build.series}_HAL_Driver/Inc/" "-I{build.system.path}/Drivers/{build.series}_HAL_Driver/Src/" "-I{build.system.path}/{build.series}/" "-I{build.system.path}/Middlewares/ST/STM32_USB_Device_Library/Core/Inc" "-I{build.system.path}/Middlewares/ST/STM32_USB_Device_Library/Core/Src"
+compiler.stm.extra_include="-I{build.source.path}" "-I{build.core.path}/avr" "-I{build.core.path}/stm32" "-I{build.core.path}/stm32/LL" "-I{build.core.path}/stm32/usb" "-I{build.core.path}/stm32/usb/hid" "-I{build.core.path}/stm32/usb/cdc" "-I{build.system.path}/Drivers/{build.series}_HAL_Driver/Inc" "-I{build.system.path}/Drivers/{build.series}_HAL_Driver/Src" "-I{build.system.path}/{build.series}" "-I{build.system.path}/Middlewares/ST/STM32_USB_Device_Library/Core/Inc" "-I{build.system.path}/Middlewares/ST/STM32_USB_Device_Library/Core/Src"
 
 compiler.warning_flags=-w
 compiler.warning_flags.none=-w
@@ -92,10 +92,22 @@ build.opt.name=build_opt.h
 build.opt.sourcepath={build.source.path}/{build.opt.name}
 build.opt.path={build.path}/sketch/{build.opt.name}
 
+build.src_wrapper.path={build.path}/sketch/SrcWrapper.cpp
+
+# Create sketch dir if not exists
+recipe.hooks.prebuild.1.pattern.windows=cmd /c if not exist "{build.path}\sketch" mkdir "{build.path}\sketch"
+recipe.hooks.prebuild.1.pattern.linux=bash -c "[ -f {build.path}/sketch ] || mkdir -p {build.path}/sketch"
+recipe.hooks.prebuild.1.pattern.macosx=bash -c "[ -f {build.path}/sketch ] || mkdir -p {build.path}/sketch"
+
 # Create empty {build.opt} if not exists in the sketch dir
-recipe.hooks.prebuild.1.pattern.windows=cmd /c if not exist "{build.opt.sourcepath}" mkdir "{build.path}\sketch" & type NUL > "{build.opt.path}"
-recipe.hooks.prebuild.1.pattern.linux=bash -c "[ -f {build.opt.sourcepath} ] || (mkdir -p {build.path}/sketch && touch {build.opt.path})"
-recipe.hooks.prebuild.1.pattern.macosx=bash -c "[ -f {build.opt.sourcepath} ] || (mkdir -p {build.path}/sketch && touch {build.opt.path})"
+recipe.hooks.prebuild.2.pattern.windows=cmd /c if not exist "{build.opt.sourcepath}" type NUL > "{build.opt.path}"
+recipe.hooks.prebuild.2.pattern.linux=bash -c "[ -f {build.opt.sourcepath} ] || touch {build.opt.path}"
+recipe.hooks.prebuild.2.pattern.macosx=bash -c "[ -f {build.opt.sourcepath} ] || touch {build.opt.path}"
+
+# Force include of SrcWrapper library
+recipe.hooks.prebuild.3.pattern.windows=cmd /c echo #include ^<SrcWrapper.h^> > "{build.src_wrapper.path}"
+recipe.hooks.prebuild.3.pattern.linux=bash -c "echo $0 > {build.src_wrapper.path}" "#include <SrcWrapper.h>"
+recipe.hooks.prebuild.3.pattern.macosx=bash -c "echo $0 > {build.src_wrapper.path}" "#include <SrcWrapper.h>"
 
 # compile patterns
 # ---------------------
@@ -113,7 +125,7 @@ recipe.S.o.pattern="{compiler.path}{compiler.S.cmd}" {compiler.S.flags} {build.i
 recipe.ar.pattern="{compiler.path}{compiler.ar.cmd}" {compiler.ar.flags} {compiler.ar.extra_flags} "{archive_file_path}" "{object_file}"
 
 ## Combine gc-sections, archives, and objects
-recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} "-T{build.variant.path}/{build.ldscript}" "-Wl,-Map,{build.path}/{build.project_name}.map" {compiler.c.elf.extra_flags} {compiler.ldflags} {compiler.arm.cmsis.ldflags} -o "{build.path}/{build.project_name}.elf" "-L{build.path}" -Wl,--start-group {object_files} -Wl,--whole-archive "{archive_file_path}" -Wl,--no-whole-archive -lc -Wl,--end-group -lm -lgcc -lstdc++
+recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}" {compiler.c.elf.flags} "-T{build.variant.path}/{build.ldscript}" "-Wl,-Map,{build.path}/{build.project_name}.map" {compiler.c.elf.extra_flags} {compiler.ldflags} {compiler.arm.cmsis.ldflags} -o "{build.path}/{build.project_name}.elf" "-L{build.path}" -Wl,--start-group {object_files} "{archive_file_path}" -lc -Wl,--end-group -lm -lgcc -lstdc++
 
 ## Create output (.bin file)
 recipe.objcopy.bin.pattern="{compiler.path}{compiler.objcopy.cmd}" {compiler.elf2bin.flags} {compiler.elf2bin.extra_flags} "{build.path}/{build.project_name}.elf" "{build.path}/{build.project_name}.bin"