diff --git a/miosix/_doc/textdoc/stm32-bootloader.txt b/miosix/_doc/textdoc/stm32-bootloader.txt
index 7b25c21e7f5db910596f9d00f2e97cc1fdd3464d..3ef8c6dd61282149f8e76dee1ef661b6d5c66365 100644
--- a/miosix/_doc/textdoc/stm32-bootloader.txt
+++ b/miosix/_doc/textdoc/stm32-bootloader.txt
@@ -76,7 +76,7 @@ interrupts @ 0x6800000, or Miosix will fail at the first interrupt.
 
 Then run openocd in a shell:
 
-sudo openocd -f miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval/stm32f10x_eval.cfg
+sudo openocd -f miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval/stm32f10x_eval.cfg
 
 and in another shell type:
 
diff --git a/miosix/arch/cortexM0_stm32/common/arch_settings.h b/miosix/arch/cortexM0_stm32f0/common/arch_settings.h
similarity index 100%
rename from miosix/arch/cortexM0_stm32/common/arch_settings.h
rename to miosix/arch/cortexM0_stm32f0/common/arch_settings.h
diff --git a/miosix/arch/cortexM0_stm32/common/interfaces-impl/arch_registers_impl.h b/miosix/arch/cortexM0_stm32f0/common/interfaces-impl/arch_registers_impl.h
similarity index 100%
rename from miosix/arch/cortexM0_stm32/common/interfaces-impl/arch_registers_impl.h
rename to miosix/arch/cortexM0_stm32f0/common/interfaces-impl/arch_registers_impl.h
diff --git a/miosix/arch/cortexM0_stm32/common/interfaces-impl/delays.cpp b/miosix/arch/cortexM0_stm32f0/common/interfaces-impl/delays.cpp
similarity index 100%
rename from miosix/arch/cortexM0_stm32/common/interfaces-impl/delays.cpp
rename to miosix/arch/cortexM0_stm32f0/common/interfaces-impl/delays.cpp
diff --git a/miosix/arch/cortexM0_stm32/common/interfaces-impl/gpio_impl.cpp b/miosix/arch/cortexM0_stm32f0/common/interfaces-impl/gpio_impl.cpp
similarity index 100%
rename from miosix/arch/cortexM0_stm32/common/interfaces-impl/gpio_impl.cpp
rename to miosix/arch/cortexM0_stm32f0/common/interfaces-impl/gpio_impl.cpp
diff --git a/miosix/arch/cortexM0_stm32/common/interfaces-impl/gpio_impl.h b/miosix/arch/cortexM0_stm32f0/common/interfaces-impl/gpio_impl.h
similarity index 100%
rename from miosix/arch/cortexM0_stm32/common/interfaces-impl/gpio_impl.h
rename to miosix/arch/cortexM0_stm32f0/common/interfaces-impl/gpio_impl.h
diff --git a/miosix/arch/cortexM0_stm32/common/interfaces-impl/portability.cpp b/miosix/arch/cortexM0_stm32f0/common/interfaces-impl/portability.cpp
similarity index 100%
rename from miosix/arch/cortexM0_stm32/common/interfaces-impl/portability.cpp
rename to miosix/arch/cortexM0_stm32f0/common/interfaces-impl/portability.cpp
diff --git a/miosix/arch/cortexM0_stm32/common/interfaces-impl/portability_impl.h b/miosix/arch/cortexM0_stm32f0/common/interfaces-impl/portability_impl.h
similarity index 100%
rename from miosix/arch/cortexM0_stm32/common/interfaces-impl/portability_impl.h
rename to miosix/arch/cortexM0_stm32f0/common/interfaces-impl/portability_impl.h
diff --git a/miosix/arch/cortexM0_stm32/stm32f072rb_stm32f0discovery/core/stage_1_boot.cpp b/miosix/arch/cortexM0_stm32f0/stm32f072rb_stm32f0discovery/core/stage_1_boot.cpp
similarity index 100%
rename from miosix/arch/cortexM0_stm32/stm32f072rb_stm32f0discovery/core/stage_1_boot.cpp
rename to miosix/arch/cortexM0_stm32f0/stm32f072rb_stm32f0discovery/core/stage_1_boot.cpp
diff --git a/miosix/arch/cortexM0_stm32/stm32f072rb_stm32f0discovery/interfaces-impl/bsp.cpp b/miosix/arch/cortexM0_stm32f0/stm32f072rb_stm32f0discovery/interfaces-impl/bsp.cpp
similarity index 100%
rename from miosix/arch/cortexM0_stm32/stm32f072rb_stm32f0discovery/interfaces-impl/bsp.cpp
rename to miosix/arch/cortexM0_stm32f0/stm32f072rb_stm32f0discovery/interfaces-impl/bsp.cpp
diff --git a/miosix/arch/cortexM0_stm32/stm32f072rb_stm32f0discovery/interfaces-impl/bsp_impl.h b/miosix/arch/cortexM0_stm32f0/stm32f072rb_stm32f0discovery/interfaces-impl/bsp_impl.h
similarity index 100%
rename from miosix/arch/cortexM0_stm32/stm32f072rb_stm32f0discovery/interfaces-impl/bsp_impl.h
rename to miosix/arch/cortexM0_stm32f0/stm32f072rb_stm32f0discovery/interfaces-impl/bsp_impl.h
diff --git a/miosix/arch/cortexM0_stm32/stm32f072rb_stm32f0discovery/stm32_128k+16k_rom.ld b/miosix/arch/cortexM0_stm32f0/stm32f072rb_stm32f0discovery/stm32_128k+16k_rom.ld
similarity index 100%
rename from miosix/arch/cortexM0_stm32/stm32f072rb_stm32f0discovery/stm32_128k+16k_rom.ld
rename to miosix/arch/cortexM0_stm32f0/stm32f072rb_stm32f0discovery/stm32_128k+16k_rom.ld
diff --git a/miosix/arch/cortexM0_stm32/stm32f072rb_stm32f0discovery/stm32f0discovery.cfg b/miosix/arch/cortexM0_stm32f0/stm32f072rb_stm32f0discovery/stm32f0discovery.cfg
similarity index 100%
rename from miosix/arch/cortexM0_stm32/stm32f072rb_stm32f0discovery/stm32f0discovery.cfg
rename to miosix/arch/cortexM0_stm32f0/stm32f072rb_stm32f0discovery/stm32f0discovery.cfg
diff --git a/miosix/arch/cortexM0_stm32/stm32f072rb_stm32f0discovery/stm32vldiscovery.cfg b/miosix/arch/cortexM0_stm32f0/stm32f072rb_stm32f0discovery/stm32vldiscovery.cfg
similarity index 85%
rename from miosix/arch/cortexM0_stm32/stm32f072rb_stm32f0discovery/stm32vldiscovery.cfg
rename to miosix/arch/cortexM0_stm32f0/stm32f072rb_stm32f0discovery/stm32vldiscovery.cfg
index 51bcdaa9fbfcbe61c300268eb079ece3edc1a9f0..648c36217ab0eef0baf1645e4170b3dcc7a7da14 100644
--- a/miosix/arch/cortexM0_stm32/stm32f072rb_stm32f0discovery/stm32vldiscovery.cfg
+++ b/miosix/arch/cortexM0_stm32f0/stm32f072rb_stm32f0discovery/stm32vldiscovery.cfg
@@ -15,4 +15,4 @@
 telnet_port 4444
 gdb_port 3333
 
-source [find arch/cortexM0_stm32/stm32f072rb_stm32f0discovery/stm32f0discovery.cfg]
+source [find arch/cortexM0_stm32f0/stm32f072rb_stm32f0discovery/stm32f0discovery.cfg]
diff --git a/miosix/arch/cortexM3_stm32/common/arch_settings.h b/miosix/arch/cortexM3_stm32f1/common/arch_settings.h
similarity index 100%
rename from miosix/arch/cortexM3_stm32/common/arch_settings.h
rename to miosix/arch/cortexM3_stm32f1/common/arch_settings.h
diff --git a/miosix/arch/cortexM3_stm32/common/interfaces-impl/arch_registers_impl.h b/miosix/arch/cortexM3_stm32f1/common/interfaces-impl/arch_registers_impl.h
similarity index 100%
rename from miosix/arch/cortexM3_stm32/common/interfaces-impl/arch_registers_impl.h
rename to miosix/arch/cortexM3_stm32f1/common/interfaces-impl/arch_registers_impl.h
diff --git a/miosix/arch/cortexM3_stm32/common/interfaces-impl/delays.cpp b/miosix/arch/cortexM3_stm32f1/common/interfaces-impl/delays.cpp
similarity index 100%
rename from miosix/arch/cortexM3_stm32/common/interfaces-impl/delays.cpp
rename to miosix/arch/cortexM3_stm32f1/common/interfaces-impl/delays.cpp
diff --git a/miosix/arch/cortexM3_stm32/common/interfaces-impl/gpio_impl.cpp b/miosix/arch/cortexM3_stm32f1/common/interfaces-impl/gpio_impl.cpp
similarity index 100%
rename from miosix/arch/cortexM3_stm32/common/interfaces-impl/gpio_impl.cpp
rename to miosix/arch/cortexM3_stm32f1/common/interfaces-impl/gpio_impl.cpp
diff --git a/miosix/arch/cortexM3_stm32/common/interfaces-impl/gpio_impl.h b/miosix/arch/cortexM3_stm32f1/common/interfaces-impl/gpio_impl.h
similarity index 100%
rename from miosix/arch/cortexM3_stm32/common/interfaces-impl/gpio_impl.h
rename to miosix/arch/cortexM3_stm32f1/common/interfaces-impl/gpio_impl.h
diff --git a/miosix/arch/cortexM3_stm32/common/interfaces-impl/portability.cpp b/miosix/arch/cortexM3_stm32f1/common/interfaces-impl/portability.cpp
similarity index 100%
rename from miosix/arch/cortexM3_stm32/common/interfaces-impl/portability.cpp
rename to miosix/arch/cortexM3_stm32f1/common/interfaces-impl/portability.cpp
diff --git a/miosix/arch/cortexM3_stm32/common/interfaces-impl/portability_impl.h b/miosix/arch/cortexM3_stm32f1/common/interfaces-impl/portability_impl.h
similarity index 100%
rename from miosix/arch/cortexM3_stm32/common/interfaces-impl/portability_impl.h
rename to miosix/arch/cortexM3_stm32f1/common/interfaces-impl/portability_impl.h
diff --git a/miosix/arch/cortexM3_stm32/stm32f100c8_microboard/core/stage_1_boot.cpp b/miosix/arch/cortexM3_stm32f1/stm32f100c8_microboard/core/stage_1_boot.cpp
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f100c8_microboard/core/stage_1_boot.cpp
rename to miosix/arch/cortexM3_stm32f1/stm32f100c8_microboard/core/stage_1_boot.cpp
diff --git a/miosix/arch/cortexM3_stm32/stm32f100c8_microboard/interfaces-impl/bsp.cpp b/miosix/arch/cortexM3_stm32f1/stm32f100c8_microboard/interfaces-impl/bsp.cpp
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f100c8_microboard/interfaces-impl/bsp.cpp
rename to miosix/arch/cortexM3_stm32f1/stm32f100c8_microboard/interfaces-impl/bsp.cpp
diff --git a/miosix/arch/cortexM3_stm32/stm32f100c8_microboard/interfaces-impl/bsp_impl.h b/miosix/arch/cortexM3_stm32f1/stm32f100c8_microboard/interfaces-impl/bsp_impl.h
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f100c8_microboard/interfaces-impl/bsp_impl.h
rename to miosix/arch/cortexM3_stm32f1/stm32f100c8_microboard/interfaces-impl/bsp_impl.h
diff --git a/miosix/arch/cortexM3_stm32/stm32f100c8_microboard/interfaces-impl/hwmapping.h b/miosix/arch/cortexM3_stm32f1/stm32f100c8_microboard/interfaces-impl/hwmapping.h
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f100c8_microboard/interfaces-impl/hwmapping.h
rename to miosix/arch/cortexM3_stm32f1/stm32f100c8_microboard/interfaces-impl/hwmapping.h
diff --git a/miosix/arch/cortexM3_stm32/stm32f100c8_microboard/stm32_63k+8k_rom.ld b/miosix/arch/cortexM3_stm32f1/stm32f100c8_microboard/stm32_63k+8k_rom.ld
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f100c8_microboard/stm32_63k+8k_rom.ld
rename to miosix/arch/cortexM3_stm32f1/stm32f100c8_microboard/stm32_63k+8k_rom.ld
diff --git a/miosix/arch/cortexM3_stm32/stm32f100c8_vaisala_rs41/core/stage_1_boot.cpp b/miosix/arch/cortexM3_stm32f1/stm32f100c8_vaisala_rs41/core/stage_1_boot.cpp
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f100c8_vaisala_rs41/core/stage_1_boot.cpp
rename to miosix/arch/cortexM3_stm32f1/stm32f100c8_vaisala_rs41/core/stage_1_boot.cpp
diff --git a/miosix/arch/cortexM3_stm32/stm32f100c8_vaisala_rs41/interfaces-impl/bsp.cpp b/miosix/arch/cortexM3_stm32f1/stm32f100c8_vaisala_rs41/interfaces-impl/bsp.cpp
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f100c8_vaisala_rs41/interfaces-impl/bsp.cpp
rename to miosix/arch/cortexM3_stm32f1/stm32f100c8_vaisala_rs41/interfaces-impl/bsp.cpp
diff --git a/miosix/arch/cortexM3_stm32/stm32f100c8_vaisala_rs41/interfaces-impl/bsp_impl.h b/miosix/arch/cortexM3_stm32f1/stm32f100c8_vaisala_rs41/interfaces-impl/bsp_impl.h
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f100c8_vaisala_rs41/interfaces-impl/bsp_impl.h
rename to miosix/arch/cortexM3_stm32f1/stm32f100c8_vaisala_rs41/interfaces-impl/bsp_impl.h
diff --git a/miosix/arch/cortexM3_stm32/stm32f100c8_vaisala_rs41/interfaces-impl/hwmapping.h b/miosix/arch/cortexM3_stm32f1/stm32f100c8_vaisala_rs41/interfaces-impl/hwmapping.h
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f100c8_vaisala_rs41/interfaces-impl/hwmapping.h
rename to miosix/arch/cortexM3_stm32f1/stm32f100c8_vaisala_rs41/interfaces-impl/hwmapping.h
diff --git a/miosix/arch/cortexM3_stm32/stm32f100c8_vaisala_rs41/stm32_64k+8k_rom.ld b/miosix/arch/cortexM3_stm32f1/stm32f100c8_vaisala_rs41/stm32_64k+8k_rom.ld
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f100c8_vaisala_rs41/stm32_64k+8k_rom.ld
rename to miosix/arch/cortexM3_stm32f1/stm32f100c8_vaisala_rs41/stm32_64k+8k_rom.ld
diff --git a/miosix/arch/cortexM3_stm32/stm32f100cb_tempsensor/core/stage_1_boot.cpp b/miosix/arch/cortexM3_stm32f1/stm32f100cb_tempsensor/core/stage_1_boot.cpp
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f100cb_tempsensor/core/stage_1_boot.cpp
rename to miosix/arch/cortexM3_stm32f1/stm32f100cb_tempsensor/core/stage_1_boot.cpp
diff --git a/miosix/arch/cortexM3_stm32/stm32f100cb_tempsensor/interfaces-impl/bsp.cpp b/miosix/arch/cortexM3_stm32f1/stm32f100cb_tempsensor/interfaces-impl/bsp.cpp
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f100cb_tempsensor/interfaces-impl/bsp.cpp
rename to miosix/arch/cortexM3_stm32f1/stm32f100cb_tempsensor/interfaces-impl/bsp.cpp
diff --git a/miosix/arch/cortexM3_stm32/stm32f100cb_tempsensor/interfaces-impl/bsp_impl.h b/miosix/arch/cortexM3_stm32f1/stm32f100cb_tempsensor/interfaces-impl/bsp_impl.h
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f100cb_tempsensor/interfaces-impl/bsp_impl.h
rename to miosix/arch/cortexM3_stm32f1/stm32f100cb_tempsensor/interfaces-impl/bsp_impl.h
diff --git a/miosix/arch/cortexM3_stm32/stm32f100cb_tempsensor/stm32_127k+8k_rom.ld b/miosix/arch/cortexM3_stm32f1/stm32f100cb_tempsensor/stm32_127k+8k_rom.ld
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f100cb_tempsensor/stm32_127k+8k_rom.ld
rename to miosix/arch/cortexM3_stm32f1/stm32f100cb_tempsensor/stm32_127k+8k_rom.ld
diff --git a/miosix/arch/cortexM3_stm32/stm32f100cx_generic/core/stage_1_boot.cpp b/miosix/arch/cortexM3_stm32f1/stm32f100cx_generic/core/stage_1_boot.cpp
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f100cx_generic/core/stage_1_boot.cpp
rename to miosix/arch/cortexM3_stm32f1/stm32f100cx_generic/core/stage_1_boot.cpp
diff --git a/miosix/arch/cortexM3_stm32/stm32f100cx_generic/interfaces-impl/bsp.cpp b/miosix/arch/cortexM3_stm32f1/stm32f100cx_generic/interfaces-impl/bsp.cpp
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f100cx_generic/interfaces-impl/bsp.cpp
rename to miosix/arch/cortexM3_stm32f1/stm32f100cx_generic/interfaces-impl/bsp.cpp
diff --git a/miosix/arch/cortexM3_stm32/stm32f100cx_generic/interfaces-impl/bsp_impl.h b/miosix/arch/cortexM3_stm32f1/stm32f100cx_generic/interfaces-impl/bsp_impl.h
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f100cx_generic/interfaces-impl/bsp_impl.h
rename to miosix/arch/cortexM3_stm32f1/stm32f100cx_generic/interfaces-impl/bsp_impl.h
diff --git a/miosix/arch/cortexM3_stm32/stm32f100cx_generic/stm32_128k+8k_rom.ld b/miosix/arch/cortexM3_stm32f1/stm32f100cx_generic/stm32_128k+8k_rom.ld
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f100cx_generic/stm32_128k+8k_rom.ld
rename to miosix/arch/cortexM3_stm32f1/stm32f100cx_generic/stm32_128k+8k_rom.ld
diff --git a/miosix/arch/cortexM3_stm32/stm32f100cx_generic/stm32_64k+8k_rom.ld b/miosix/arch/cortexM3_stm32f1/stm32f100cx_generic/stm32_64k+8k_rom.ld
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f100cx_generic/stm32_64k+8k_rom.ld
rename to miosix/arch/cortexM3_stm32f1/stm32f100cx_generic/stm32_64k+8k_rom.ld
diff --git a/miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery/core/stage_1_boot.cpp b/miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery/core/stage_1_boot.cpp
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery/core/stage_1_boot.cpp
rename to miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery/core/stage_1_boot.cpp
diff --git a/miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery/interfaces-impl/bsp.cpp b/miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery/interfaces-impl/bsp.cpp
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery/interfaces-impl/bsp.cpp
rename to miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery/interfaces-impl/bsp.cpp
diff --git a/miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery/interfaces-impl/bsp_impl.h b/miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery/interfaces-impl/bsp_impl.h
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery/interfaces-impl/bsp_impl.h
rename to miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery/interfaces-impl/bsp_impl.h
diff --git a/miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery/stm32_128k+8k_rom.ld b/miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery/stm32_128k+8k_rom.ld
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery/stm32_128k+8k_rom.ld
rename to miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery/stm32_128k+8k_rom.ld
diff --git a/miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery/stm32vldiscovery.cfg b/miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery/stm32vldiscovery.cfg
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery/stm32vldiscovery.cfg
rename to miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery/stm32vldiscovery.cfg
diff --git a/miosix/arch/cortexM3_stm32/stm32f100rc_solertegiard/core/stage_1_boot.cpp b/miosix/arch/cortexM3_stm32f1/stm32f100rc_solertegiard/core/stage_1_boot.cpp
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f100rc_solertegiard/core/stage_1_boot.cpp
rename to miosix/arch/cortexM3_stm32f1/stm32f100rc_solertegiard/core/stage_1_boot.cpp
diff --git a/miosix/arch/cortexM3_stm32/stm32f100rc_solertegiard/interfaces-impl/bsp.cpp b/miosix/arch/cortexM3_stm32f1/stm32f100rc_solertegiard/interfaces-impl/bsp.cpp
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f100rc_solertegiard/interfaces-impl/bsp.cpp
rename to miosix/arch/cortexM3_stm32f1/stm32f100rc_solertegiard/interfaces-impl/bsp.cpp
diff --git a/miosix/arch/cortexM3_stm32/stm32f100rc_solertegiard/interfaces-impl/bsp_impl.h b/miosix/arch/cortexM3_stm32f1/stm32f100rc_solertegiard/interfaces-impl/bsp_impl.h
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f100rc_solertegiard/interfaces-impl/bsp_impl.h
rename to miosix/arch/cortexM3_stm32f1/stm32f100rc_solertegiard/interfaces-impl/bsp_impl.h
diff --git a/miosix/arch/cortexM3_stm32/stm32f100rc_solertegiard/interfaces-impl/hwmapping.h b/miosix/arch/cortexM3_stm32f1/stm32f100rc_solertegiard/interfaces-impl/hwmapping.h
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f100rc_solertegiard/interfaces-impl/hwmapping.h
rename to miosix/arch/cortexM3_stm32f1/stm32f100rc_solertegiard/interfaces-impl/hwmapping.h
diff --git a/miosix/arch/cortexM3_stm32/stm32f100rc_solertegiard/stm32_256k+24k_rom.ld b/miosix/arch/cortexM3_stm32f1/stm32f100rc_solertegiard/stm32_256k+24k_rom.ld
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f100rc_solertegiard/stm32_256k+24k_rom.ld
rename to miosix/arch/cortexM3_stm32f1/stm32f100rc_solertegiard/stm32_256k+24k_rom.ld
diff --git a/miosix/arch/cortexM3_stm32/stm32f100rc_solertegiard/stm32vldiscovery.cfg b/miosix/arch/cortexM3_stm32f1/stm32f100rc_solertegiard/stm32vldiscovery.cfg
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f100rc_solertegiard/stm32vldiscovery.cfg
rename to miosix/arch/cortexM3_stm32f1/stm32f100rc_solertegiard/stm32vldiscovery.cfg
diff --git a/miosix/arch/cortexM3_stm32/stm32f103c8_breakout/core/stage_1_boot.cpp b/miosix/arch/cortexM3_stm32f1/stm32f103c8_breakout/core/stage_1_boot.cpp
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f103c8_breakout/core/stage_1_boot.cpp
rename to miosix/arch/cortexM3_stm32f1/stm32f103c8_breakout/core/stage_1_boot.cpp
diff --git a/miosix/arch/cortexM3_stm32/stm32f103c8_breakout/interfaces-impl/bsp.cpp b/miosix/arch/cortexM3_stm32f1/stm32f103c8_breakout/interfaces-impl/bsp.cpp
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f103c8_breakout/interfaces-impl/bsp.cpp
rename to miosix/arch/cortexM3_stm32f1/stm32f103c8_breakout/interfaces-impl/bsp.cpp
diff --git a/miosix/arch/cortexM3_stm32/stm32f103c8_breakout/interfaces-impl/bsp_impl.h b/miosix/arch/cortexM3_stm32f1/stm32f103c8_breakout/interfaces-impl/bsp_impl.h
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f103c8_breakout/interfaces-impl/bsp_impl.h
rename to miosix/arch/cortexM3_stm32f1/stm32f103c8_breakout/interfaces-impl/bsp_impl.h
diff --git a/miosix/arch/cortexM3_stm32/stm32f103c8_breakout/stm32_64k+20k_rom.ld b/miosix/arch/cortexM3_stm32f1/stm32f103c8_breakout/stm32_64k+20k_rom.ld
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f103c8_breakout/stm32_64k+20k_rom.ld
rename to miosix/arch/cortexM3_stm32f1/stm32f103c8_breakout/stm32_64k+20k_rom.ld
diff --git a/miosix/arch/cortexM3_stm32/stm32f103c8_breakout/stm32vldiscovery.cfg b/miosix/arch/cortexM3_stm32f1/stm32f103c8_breakout/stm32vldiscovery.cfg
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f103c8_breakout/stm32vldiscovery.cfg
rename to miosix/arch/cortexM3_stm32f1/stm32f103c8_breakout/stm32vldiscovery.cfg
diff --git a/miosix/arch/cortexM3_stm32/stm32f103cb_als_mainboard_rev2/core/stage_1_boot.cpp b/miosix/arch/cortexM3_stm32f1/stm32f103cb_als_mainboard_rev2/core/stage_1_boot.cpp
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f103cb_als_mainboard_rev2/core/stage_1_boot.cpp
rename to miosix/arch/cortexM3_stm32f1/stm32f103cb_als_mainboard_rev2/core/stage_1_boot.cpp
diff --git a/miosix/arch/cortexM3_stm32/stm32f103cb_als_mainboard_rev2/interfaces-impl/bsp.cpp b/miosix/arch/cortexM3_stm32f1/stm32f103cb_als_mainboard_rev2/interfaces-impl/bsp.cpp
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f103cb_als_mainboard_rev2/interfaces-impl/bsp.cpp
rename to miosix/arch/cortexM3_stm32f1/stm32f103cb_als_mainboard_rev2/interfaces-impl/bsp.cpp
diff --git a/miosix/arch/cortexM3_stm32/stm32f103cb_als_mainboard_rev2/interfaces-impl/bsp_impl.h b/miosix/arch/cortexM3_stm32f1/stm32f103cb_als_mainboard_rev2/interfaces-impl/bsp_impl.h
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f103cb_als_mainboard_rev2/interfaces-impl/bsp_impl.h
rename to miosix/arch/cortexM3_stm32f1/stm32f103cb_als_mainboard_rev2/interfaces-impl/bsp_impl.h
diff --git a/miosix/arch/cortexM3_stm32/stm32f103cb_als_mainboard_rev2/interfaces-impl/hwmapping.h b/miosix/arch/cortexM3_stm32f1/stm32f103cb_als_mainboard_rev2/interfaces-impl/hwmapping.h
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f103cb_als_mainboard_rev2/interfaces-impl/hwmapping.h
rename to miosix/arch/cortexM3_stm32f1/stm32f103cb_als_mainboard_rev2/interfaces-impl/hwmapping.h
diff --git a/miosix/arch/cortexM3_stm32/stm32f103cb_als_mainboard_rev2/stm32_128k+20k_rom.ld b/miosix/arch/cortexM3_stm32f1/stm32f103cb_als_mainboard_rev2/stm32_128k+20k_rom.ld
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f103cb_als_mainboard_rev2/stm32_128k+20k_rom.ld
rename to miosix/arch/cortexM3_stm32f1/stm32f103cb_als_mainboard_rev2/stm32_128k+20k_rom.ld
diff --git a/miosix/arch/cortexM3_stm32/stm32f103cx_generic/core/stage_1_boot.cpp b/miosix/arch/cortexM3_stm32f1/stm32f103cx_generic/core/stage_1_boot.cpp
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f103cx_generic/core/stage_1_boot.cpp
rename to miosix/arch/cortexM3_stm32f1/stm32f103cx_generic/core/stage_1_boot.cpp
diff --git a/miosix/arch/cortexM3_stm32/stm32f103cx_generic/interfaces-impl/bsp.cpp b/miosix/arch/cortexM3_stm32f1/stm32f103cx_generic/interfaces-impl/bsp.cpp
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f103cx_generic/interfaces-impl/bsp.cpp
rename to miosix/arch/cortexM3_stm32f1/stm32f103cx_generic/interfaces-impl/bsp.cpp
diff --git a/miosix/arch/cortexM3_stm32/stm32f103cx_generic/interfaces-impl/bsp_impl.h b/miosix/arch/cortexM3_stm32f1/stm32f103cx_generic/interfaces-impl/bsp_impl.h
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f103cx_generic/interfaces-impl/bsp_impl.h
rename to miosix/arch/cortexM3_stm32f1/stm32f103cx_generic/interfaces-impl/bsp_impl.h
diff --git a/miosix/arch/cortexM3_stm32/stm32f103cx_generic/stm32_128k+20k_rom.ld b/miosix/arch/cortexM3_stm32f1/stm32f103cx_generic/stm32_128k+20k_rom.ld
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f103cx_generic/stm32_128k+20k_rom.ld
rename to miosix/arch/cortexM3_stm32f1/stm32f103cx_generic/stm32_128k+20k_rom.ld
diff --git a/miosix/arch/cortexM3_stm32/stm32f103cx_generic/stm32_64k+20k_rom.ld b/miosix/arch/cortexM3_stm32f1/stm32f103cx_generic/stm32_64k+20k_rom.ld
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f103cx_generic/stm32_64k+20k_rom.ld
rename to miosix/arch/cortexM3_stm32f1/stm32f103cx_generic/stm32_64k+20k_rom.ld
diff --git a/miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2/core/stage_1_boot.cpp b/miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2/core/stage_1_boot.cpp
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2/core/stage_1_boot.cpp
rename to miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2/core/stage_1_boot.cpp
diff --git a/miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2/interfaces-impl/bsp.cpp b/miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2/interfaces-impl/bsp.cpp
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2/interfaces-impl/bsp.cpp
rename to miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2/interfaces-impl/bsp.cpp
diff --git a/miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2/interfaces-impl/bsp_impl.h b/miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2/interfaces-impl/bsp_impl.h
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2/interfaces-impl/bsp_impl.h
rename to miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2/interfaces-impl/bsp_impl.h
diff --git a/miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2/interfaces-impl/hwmapping.h b/miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2/interfaces-impl/hwmapping.h
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2/interfaces-impl/hwmapping.h
rename to miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2/interfaces-impl/hwmapping.h
diff --git a/miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2/stm32_512k+64k_ram.ld b/miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2/stm32_512k+64k_ram.ld
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2/stm32_512k+64k_ram.ld
rename to miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2/stm32_512k+64k_ram.ld
diff --git a/miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2/stm32_512k+64k_rom.ld b/miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2/stm32_512k+64k_rom.ld
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2/stm32_512k+64k_rom.ld
rename to miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2/stm32_512k+64k_rom.ld
diff --git a/miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini/core/stage_1_boot.cpp b/miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini/core/stage_1_boot.cpp
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini/core/stage_1_boot.cpp
rename to miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini/core/stage_1_boot.cpp
diff --git a/miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini/interfaces-impl/bsp.cpp b/miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini/interfaces-impl/bsp.cpp
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini/interfaces-impl/bsp.cpp
rename to miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini/interfaces-impl/bsp.cpp
diff --git a/miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini/interfaces-impl/bsp_impl.h b/miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini/interfaces-impl/bsp_impl.h
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini/interfaces-impl/bsp_impl.h
rename to miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini/interfaces-impl/bsp_impl.h
diff --git a/miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini/interfaces-impl/hwmapping.h b/miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini/interfaces-impl/hwmapping.h
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini/interfaces-impl/hwmapping.h
rename to miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini/interfaces-impl/hwmapping.h
diff --git a/miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini/stm32_512k+64k_rom.ld b/miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini/stm32_512k+64k_rom.ld
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini/stm32_512k+64k_rom.ld
rename to miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini/stm32_512k+64k_rom.ld
diff --git a/miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2/core/stage_1_boot.cpp b/miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2/core/stage_1_boot.cpp
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2/core/stage_1_boot.cpp
rename to miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2/core/stage_1_boot.cpp
diff --git a/miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2/interfaces-impl/bsp.cpp b/miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2/interfaces-impl/bsp.cpp
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2/interfaces-impl/bsp.cpp
rename to miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2/interfaces-impl/bsp.cpp
diff --git a/miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2/interfaces-impl/bsp_impl.h b/miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2/interfaces-impl/bsp_impl.h
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2/interfaces-impl/bsp_impl.h
rename to miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2/interfaces-impl/bsp_impl.h
diff --git a/miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2/interfaces-impl/hwmapping.h b/miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2/interfaces-impl/hwmapping.h
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2/interfaces-impl/hwmapping.h
rename to miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2/interfaces-impl/hwmapping.h
diff --git a/miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2/stm32_512k+64k_rom.ld b/miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2/stm32_512k+64k_rom.ld
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2/stm32_512k+64k_rom.ld
rename to miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2/stm32_512k+64k_rom.ld
diff --git a/miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval/core/stage_1_boot.cpp b/miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval/core/stage_1_boot.cpp
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval/core/stage_1_boot.cpp
rename to miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval/core/stage_1_boot.cpp
diff --git a/miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval/interfaces-impl/bsp.cpp b/miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval/interfaces-impl/bsp.cpp
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval/interfaces-impl/bsp.cpp
rename to miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval/interfaces-impl/bsp.cpp
diff --git a/miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval/interfaces-impl/bsp_impl.h b/miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval/interfaces-impl/bsp_impl.h
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval/interfaces-impl/bsp_impl.h
rename to miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval/interfaces-impl/bsp_impl.h
diff --git a/miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval/stm32_512k+64k_all_in_xram.ld b/miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval/stm32_512k+64k_all_in_xram.ld
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval/stm32_512k+64k_all_in_xram.ld
rename to miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval/stm32_512k+64k_all_in_xram.ld
diff --git a/miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval/stm32_512k+64k_rom.ld b/miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval/stm32_512k+64k_rom.ld
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval/stm32_512k+64k_rom.ld
rename to miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval/stm32_512k+64k_rom.ld
diff --git a/miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval/stm32_512k+64k_xram.ld b/miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval/stm32_512k+64k_xram.ld
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval/stm32_512k+64k_xram.ld
rename to miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval/stm32_512k+64k_xram.ld
diff --git a/miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval/stm32f10x_eval.cfg b/miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval/stm32f10x_eval.cfg
similarity index 100%
rename from miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval/stm32f10x_eval.cfg
rename to miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval/stm32f10x_eval.cfg
diff --git a/miosix/config/Makefile.inc b/miosix/config/Makefile.inc
index 61c518c9afb3437fddb9fffb931b26e1a56e38af..c054cacf879d822072568b759046d63191b9e7fa 100644
--- a/miosix/config/Makefile.inc
+++ b/miosix/config/Makefile.inc
@@ -103,7 +103,7 @@ ifeq ($(OPT_BOARD),stm32f103ze_stm3210e-eval)
     ##    The microcontroller must have an external memory interface.
     ## Warning! enable external ram if you use a linker script that requires it
     ## (see the XRAM flag below)
-    LINKER_SCRIPT_PATH := arch/cortexM3_stm32/stm32f103ze_stm3210e-eval/
+    LINKER_SCRIPT_PATH := arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval/
     #LINKER_SCRIPT := $(LINKER_SCRIPT_PATH)stm32_512k+64k_rom.ld
     #LINKER_SCRIPT := $(LINKER_SCRIPT_PATH)stm32_512k+64k_xram.ld
     LINKER_SCRIPT := $(LINKER_SCRIPT_PATH)stm32_512k+64k_all_in_xram.ld
@@ -137,7 +137,7 @@ ifeq ($(OPT_BOARD),stm32f103ve_mp3v2)
     ## 1) Code in FLASH, stack + heap in internal RAM (file *_rom.ld)
     ## 2) Code + stack + heap in internal RAM (file *_ram.ld)
     ## Note: this board relies on a bootloader for interrupt forwarding in ram
-    LINKER_SCRIPT_PATH := arch/cortexM3_stm32/stm32f103ve_mp3v2/
+    LINKER_SCRIPT_PATH := arch/cortexM3_stm32f1/stm32f103ve_mp3v2/
     LINKER_SCRIPT := $(LINKER_SCRIPT_PATH)stm32_512k+64k_rom.ld
     #LINKER_SCRIPT := $(LINKER_SCRIPT_PATH)stm32_512k+64k_ram.ld
 
@@ -522,7 +522,7 @@ endif
 ifeq ($(OPT_BOARD),stm32f103cx_generic)
     
     # stm32f103c8 has 64K, stm32f103cb has 128K
-    LINKER_SCRIPT_PATH := arch/cortexM3_stm32/stm32f103cx_generic/
+    LINKER_SCRIPT_PATH := arch/cortexM3_stm32f1/stm32f103cx_generic/
     #LINKER_SCRIPT := $(LINKER_SCRIPT_PATH)stm32_64k+20k_rom.ld
     LINKER_SCRIPT := $(LINKER_SCRIPT_PATH)stm32_128k+20k_rom.ld
     
@@ -548,7 +548,7 @@ endif
 ifeq ($(OPT_BOARD),stm32f100cx_generic)
 
     # stm32f100c8 has 64K, stm32f100cb has 128K
-    LINKER_SCRIPT_PATH := arch/cortexM3_stm32/stm32f100cx_generic/
+    LINKER_SCRIPT_PATH := arch/cortexM3_stm32f1/stm32f100cx_generic/
     #LINKER_SCRIPT := $(LINKER_SCRIPT_PATH)stm32_64k+8k_rom.ld
     LINKER_SCRIPT := $(LINKER_SCRIPT_PATH)stm32_128k+8k_rom.ld
 
@@ -661,15 +661,15 @@ endif
 ifeq ($(OPT_BOARD),lpc2138_miosix_board)
     ARCH := arm7_lpc2000
 else ifeq ($(OPT_BOARD),stm32f103ze_stm3210e-eval)
-    ARCH := cortexM3_stm32
+    ARCH := cortexM3_stm32f1
 else ifeq ($(OPT_BOARD),stm32f103ve_mp3v2)
-    ARCH := cortexM3_stm32
+    ARCH := cortexM3_stm32f1
 else ifeq ($(OPT_BOARD),stm32f100rb_stm32vldiscovery)
-    ARCH := cortexM3_stm32
+    ARCH := cortexM3_stm32f1
 else ifeq ($(OPT_BOARD),stm32f103ve_strive_mini)
-    ARCH := cortexM3_stm32
+    ARCH := cortexM3_stm32f1
 else ifeq ($(OPT_BOARD),stm32f103ze_redbull_v2)
-    ARCH := cortexM3_stm32
+    ARCH := cortexM3_stm32f1
 else ifeq ($(OPT_BOARD),stm32f407vg_stm32f4discovery)
     ARCH := cortexM4_stm32f4
 else ifeq ($(OPT_BOARD),stm32f207ig_stm3220g-eval)
@@ -687,9 +687,9 @@ else ifeq ($(OPT_BOARD),stm32f407vg_bitsboard)
 else ifeq ($(OPT_BOARD),stm32f429zi_stm32f4discovery)
     ARCH := cortexM4_stm32f4
 else ifeq ($(OPT_BOARD),stm32f103cb_als_mainboard_rev2)
-    ARCH := cortexM3_stm32
+    ARCH := cortexM3_stm32f1
 else ifeq ($(OPT_BOARD),stm32f100cb_tempsensor)
-    ARCH := cortexM3_stm32
+    ARCH := cortexM3_stm32f1
 else ifeq ($(OPT_BOARD),stm32f429zi_oledboard2)
     ARCH := cortexM4_stm32f4
 else ifeq ($(OPT_BOARD),efm32gg332f1024_wandstem)
@@ -699,15 +699,15 @@ else ifeq ($(OPT_BOARD),stm32f411re_nucleo)
 else ifeq ($(OPT_BOARD),stm32f429zi_skyward_anakin)
     ARCH := cortexM4_stm32f4
 else ifeq ($(OPT_BOARD),stm32f100rc_solertegiard)
-    ARCH := cortexM3_stm32
+    ARCH := cortexM3_stm32f1
 else ifeq ($(OPT_BOARD),stm32f205rc_skyward_stormtrooper)
     ARCH := cortexM3_stm32f2
 else ifeq ($(OPT_BOARD),stm32f401vc_stm32f4discovery)
     ARCH := cortexM4_stm32f4
 else ifeq ($(OPT_BOARD),stm32f103c8_breakout)
-    ARCH := cortexM3_stm32
+    ARCH := cortexM3_stm32f1
 else ifeq ($(OPT_BOARD),stm32f100c8_microboard)
-    ARCH := cortexM3_stm32
+    ARCH := cortexM3_stm32f1
 else ifeq ($(OPT_BOARD),stm32f469ni_stm32f469i-disco)
     ARCH := cortexM4_stm32f4
 else ifeq ($(OPT_BOARD),stm32f429zi_skyward_homeone)
@@ -723,15 +723,15 @@ else ifeq ($(OPT_BOARD),stm32f407vg_thermal_test_chip)
 else ifeq ($(OPT_BOARD),stm32f205_generic)
     ARCH := cortexM3_stm32f2
 else ifeq ($(OPT_BOARD),stm32f103cx_generic)
-    ARCH := cortexM3_stm32
+    ARCH := cortexM3_stm32f1
 else ifeq ($(OPT_BOARD),stm32f072rb_stm32f0discovery)
     ARCH := cortexM0_stm32f0
 else ifeq ($(OPT_BOARD),stm32f100cx_generic)
-    ARCH := cortexM3_stm32
+    ARCH := cortexM3_stm32f1
 else ifeq ($(OPT_BOARD),stm32f303vc_stm32f3discovery)
     ARCH := cortexM4_stm32f3
 else ifeq ($(OPT_BOARD),stm32f100c8_vaisala_rs41)
-    ARCH := cortexM3_stm32
+    ARCH := cortexM3_stm32f1
 else ifeq ($(OPT_BOARD),stm32l476rg_nucleo)
     ARCH := cortexM4_stm32l4
 else ifeq ($(OPT_BOARD),atsam4lc2aa_generic)
@@ -838,11 +838,11 @@ ifeq ($(ARCH),arm7_lpc2000)
     PROGRAM_CMDLINE := lpc21isp -verify main.hex /dev/ttyUSB0 115200 14746
 
 ##-----------------------------------------------------------------------------
-## ARCHITECTURE: cortexM3_stm32
+## ARCHITECTURE: cortexM3_stm32f1
 ##
-else ifeq ($(ARCH),cortexM3_stm32)
+else ifeq ($(ARCH),cortexM3_stm32f1)
     ## Base directory with header files for this board
-    ARCH_INC := arch/cortexM3_stm32/common
+    ARCH_INC := arch/cortexM3_stm32f1/common
 
     ##-------------------------------------------------------------------------
     ## BOARD: stm32f103ze_stm3210e-eval
@@ -850,7 +850,7 @@ else ifeq ($(ARCH),cortexM3_stm32)
     ifeq ($(OPT_BOARD),stm32f103ze_stm3210e-eval)
 
         ## Base directory with header files for this board
-        BOARD_INC := arch/cortexM3_stm32/stm32f103ze_stm3210e-eval
+        BOARD_INC := arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval
 
         ## Select linker script and boot file
         ## Their path must be relative to the miosix directory.
@@ -886,7 +886,7 @@ else ifeq ($(ARCH),cortexM3_stm32)
     else ifeq ($(OPT_BOARD),stm32f103ve_mp3v2)
 
         ## Base directory with header files for this board
-        BOARD_INC := arch/cortexM3_stm32/stm32f103ve_mp3v2
+        BOARD_INC := arch/cortexM3_stm32f1/stm32f103ve_mp3v2
 
         ## Select linker script and boot file
         ## Their path must be relative to the miosix directory.
@@ -924,7 +924,7 @@ else ifeq ($(ARCH),cortexM3_stm32)
     else ifeq ($(OPT_BOARD),stm32f100rb_stm32vldiscovery)
 
         ## Base directory with header files for this board
-        BOARD_INC := arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery
+        BOARD_INC := arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery
 
         ## Select linker script and boot file
         ## Their path must be relative to the miosix directory.
@@ -960,7 +960,7 @@ else ifeq ($(ARCH),cortexM3_stm32)
     else ifeq ($(OPT_BOARD),stm32f100rc_solertegiard)
 
         ## Base directory with header files for this board
-        BOARD_INC := arch/cortexM3_stm32/stm32f100rc_solertegiard
+        BOARD_INC := arch/cortexM3_stm32f1/stm32f100rc_solertegiard
 
         ## Select linker script and boot file
         ## Their path must be relative to the miosix directory.
@@ -996,7 +996,7 @@ else ifeq ($(ARCH),cortexM3_stm32)
     else ifeq ($(OPT_BOARD),stm32f103ve_strive_mini)
 
         ## Base directory with header files for this board
-        BOARD_INC := arch/cortexM3_stm32/stm32f103ve_strive_mini
+        BOARD_INC := arch/cortexM3_stm32f1/stm32f103ve_strive_mini
 
         ## Select linker script and boot file
         ## Their path must be relative to the miosix directory.
@@ -1030,7 +1030,7 @@ else ifeq ($(ARCH),cortexM3_stm32)
     ##
     else ifeq ($(OPT_BOARD),stm32f103ze_redbull_v2)
         ## Base directory with header files for this board
-        BOARD_INC := arch/cortexM3_stm32/stm32f103ze_redbull_v2
+        BOARD_INC := arch/cortexM3_stm32f1/stm32f103ze_redbull_v2
 
         ## Select linker script and boot file
         ## Their path must be relative to the miosix directory.
@@ -1066,7 +1066,7 @@ else ifeq ($(ARCH),cortexM3_stm32)
     ##
     else ifeq ($(OPT_BOARD),stm32f103cb_als_mainboard_rev2)
         ## Base directory with header files for this board
-        BOARD_INC := arch/cortexM3_stm32/stm32f103cb_als_mainboard_rev2
+        BOARD_INC := arch/cortexM3_stm32f1/stm32f103cb_als_mainboard_rev2
 
         ## Select linker script and boot file
         ## Their path must be relative to the miosix directory.
@@ -1100,7 +1100,7 @@ else ifeq ($(ARCH),cortexM3_stm32)
     else ifeq ($(OPT_BOARD),stm32f100cb_tempsensor)
 
         ## Base directory with header files for this board
-        BOARD_INC := arch/cortexM3_stm32/stm32f100cb_tempsensor
+        BOARD_INC := arch/cortexM3_stm32f1/stm32f100cb_tempsensor
 
         ## Select linker script and boot file
         ## Their path must be relative to the miosix directory.
@@ -1134,7 +1134,7 @@ else ifeq ($(ARCH),cortexM3_stm32)
     else ifeq ($(OPT_BOARD),stm32f103c8_breakout)
 
         ## Base directory with header files for this board
-        BOARD_INC := arch/cortexM3_stm32/stm32f103c8_breakout
+        BOARD_INC := arch/cortexM3_stm32f1/stm32f103c8_breakout
 
         ## Select linker script and boot file
         ## Their path must be relative to the miosix directory.
@@ -1166,7 +1166,7 @@ else ifeq ($(ARCH),cortexM3_stm32)
     else ifeq ($(OPT_BOARD),stm32f100c8_microboard)
 
         ## Base directory with header files for this board
-        BOARD_INC := arch/cortexM3_stm32/stm32f100c8_microboard
+        BOARD_INC := arch/cortexM3_stm32f1/stm32f100c8_microboard
 
         ## Select linker script and boot file
         ## Their path must be relative to the miosix directory.
@@ -1201,7 +1201,7 @@ else ifeq ($(ARCH),cortexM3_stm32)
     else ifeq ($(OPT_BOARD),stm32f103cx_generic)
 
         ## Base directory with header files for this board
-        BOARD_INC := arch/cortexM3_stm32/stm32f103cx_generic
+        BOARD_INC := arch/cortexM3_stm32f1/stm32f103cx_generic
 
         ## Select linker script and boot file
         ## Their path must be relative to the miosix directory.
@@ -1232,7 +1232,7 @@ else ifeq ($(ARCH),cortexM3_stm32)
     else ifeq ($(OPT_BOARD),stm32f100cx_generic)
 
         ## Base directory with header files for this board
-        BOARD_INC := arch/cortexM3_stm32/stm32f100cx_generic
+        BOARD_INC := arch/cortexM3_stm32f1/stm32f100cx_generic
 
         ## Select linker script and boot file
         ## Their path must be relative to the miosix directory.
@@ -1263,7 +1263,7 @@ else ifeq ($(ARCH),cortexM3_stm32)
     else ifeq ($(OPT_BOARD),stm32f100c8_vaisala_rs41)
 
         ## Base directory with header files for this board
-        BOARD_INC := arch/cortexM3_stm32/stm32f100c8_vaisala_rs41
+        BOARD_INC := arch/cortexM3_stm32f1/stm32f100c8_vaisala_rs41
 
         ## Select linker script and boot file
         ## Their path must be relative to the miosix directory.
@@ -2460,14 +2460,14 @@ else ifeq ($(ARCH),cortexM7_stm32h7)
 ##
 else ifeq ($(ARCH),cortexM0_stm32f0)
     ## Base directory with else header files for this board
-    ARCH_INC := arch/cortexM0_stm32/common
+    ARCH_INC := arch/cortexM0_stm32f0/common
 
     ##-------------------------------------------------------------------------
     ## BOARD: stm32f072rb_stm32f0discovery
     ##
     ifeq ($(OPT_BOARD),stm32f072rb_stm32f0discovery)
         ## Base directory with header files for this board
-        BOARD_INC := arch/cortexM0_stm32/stm32f072rb_stm32f0discovery
+        BOARD_INC := arch/cortexM0_stm32f0/stm32f072rb_stm32f0discovery
 
         ## Select linker script and boot file
         ## Their path must be relative to the miosix directory.
diff --git a/miosix/config/arch/cortexM0_stm32/stm32f072rb_stm32f0discovery/board_settings.h b/miosix/config/arch/cortexM0_stm32f0/stm32f072rb_stm32f0discovery/board_settings.h
similarity index 100%
rename from miosix/config/arch/cortexM0_stm32/stm32f072rb_stm32f0discovery/board_settings.h
rename to miosix/config/arch/cortexM0_stm32f0/stm32f072rb_stm32f0discovery/board_settings.h
diff --git a/miosix/config/arch/cortexM3_stm32/stm32f100c8_microboard/board_settings.h b/miosix/config/arch/cortexM3_stm32f1/stm32f100c8_microboard/board_settings.h
similarity index 100%
rename from miosix/config/arch/cortexM3_stm32/stm32f100c8_microboard/board_settings.h
rename to miosix/config/arch/cortexM3_stm32f1/stm32f100c8_microboard/board_settings.h
diff --git a/miosix/config/arch/cortexM3_stm32/stm32f100c8_vaisala_rs41/board_settings.h b/miosix/config/arch/cortexM3_stm32f1/stm32f100c8_vaisala_rs41/board_settings.h
similarity index 100%
rename from miosix/config/arch/cortexM3_stm32/stm32f100c8_vaisala_rs41/board_settings.h
rename to miosix/config/arch/cortexM3_stm32f1/stm32f100c8_vaisala_rs41/board_settings.h
diff --git a/miosix/config/arch/cortexM3_stm32/stm32f100cb_tempsensor/board_settings.h b/miosix/config/arch/cortexM3_stm32f1/stm32f100cb_tempsensor/board_settings.h
similarity index 100%
rename from miosix/config/arch/cortexM3_stm32/stm32f100cb_tempsensor/board_settings.h
rename to miosix/config/arch/cortexM3_stm32f1/stm32f100cb_tempsensor/board_settings.h
diff --git a/miosix/config/arch/cortexM3_stm32/stm32f100cx_generic/board_settings.h b/miosix/config/arch/cortexM3_stm32f1/stm32f100cx_generic/board_settings.h
similarity index 100%
rename from miosix/config/arch/cortexM3_stm32/stm32f100cx_generic/board_settings.h
rename to miosix/config/arch/cortexM3_stm32f1/stm32f100cx_generic/board_settings.h
diff --git a/miosix/config/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery/board_settings.h b/miosix/config/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery/board_settings.h
similarity index 100%
rename from miosix/config/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery/board_settings.h
rename to miosix/config/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery/board_settings.h
diff --git a/miosix/config/arch/cortexM3_stm32/stm32f100rc_solertegiard/board_settings.h b/miosix/config/arch/cortexM3_stm32f1/stm32f100rc_solertegiard/board_settings.h
similarity index 100%
rename from miosix/config/arch/cortexM3_stm32/stm32f100rc_solertegiard/board_settings.h
rename to miosix/config/arch/cortexM3_stm32f1/stm32f100rc_solertegiard/board_settings.h
diff --git a/miosix/config/arch/cortexM3_stm32/stm32f103c8_breakout/board_settings.h b/miosix/config/arch/cortexM3_stm32f1/stm32f103c8_breakout/board_settings.h
similarity index 100%
rename from miosix/config/arch/cortexM3_stm32/stm32f103c8_breakout/board_settings.h
rename to miosix/config/arch/cortexM3_stm32f1/stm32f103c8_breakout/board_settings.h
diff --git a/miosix/config/arch/cortexM3_stm32/stm32f103cb_als_mainboard_rev2/board_settings.h b/miosix/config/arch/cortexM3_stm32f1/stm32f103cb_als_mainboard_rev2/board_settings.h
similarity index 100%
rename from miosix/config/arch/cortexM3_stm32/stm32f103cb_als_mainboard_rev2/board_settings.h
rename to miosix/config/arch/cortexM3_stm32f1/stm32f103cb_als_mainboard_rev2/board_settings.h
diff --git a/miosix/config/arch/cortexM3_stm32/stm32f103cx_generic/board_settings.h b/miosix/config/arch/cortexM3_stm32f1/stm32f103cx_generic/board_settings.h
similarity index 100%
rename from miosix/config/arch/cortexM3_stm32/stm32f103cx_generic/board_settings.h
rename to miosix/config/arch/cortexM3_stm32f1/stm32f103cx_generic/board_settings.h
diff --git a/miosix/config/arch/cortexM3_stm32/stm32f103ve_mp3v2/board_settings.h b/miosix/config/arch/cortexM3_stm32f1/stm32f103ve_mp3v2/board_settings.h
similarity index 100%
rename from miosix/config/arch/cortexM3_stm32/stm32f103ve_mp3v2/board_settings.h
rename to miosix/config/arch/cortexM3_stm32f1/stm32f103ve_mp3v2/board_settings.h
diff --git a/miosix/config/arch/cortexM3_stm32/stm32f103ve_strive_mini/board_settings.h b/miosix/config/arch/cortexM3_stm32f1/stm32f103ve_strive_mini/board_settings.h
similarity index 100%
rename from miosix/config/arch/cortexM3_stm32/stm32f103ve_strive_mini/board_settings.h
rename to miosix/config/arch/cortexM3_stm32f1/stm32f103ve_strive_mini/board_settings.h
diff --git a/miosix/config/arch/cortexM3_stm32/stm32f103ze_redbull_v2/board_settings.h b/miosix/config/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2/board_settings.h
similarity index 100%
rename from miosix/config/arch/cortexM3_stm32/stm32f103ze_redbull_v2/board_settings.h
rename to miosix/config/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2/board_settings.h
diff --git a/miosix/config/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval/board_settings.h b/miosix/config/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval/board_settings.h
similarity index 100%
rename from miosix/config/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval/board_settings.h
rename to miosix/config/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval/board_settings.h
diff --git a/miosix_np_2/nbproject/configurations.xml b/miosix_np_2/nbproject/configurations.xml
index 1f7805cc54c0e2abd35cf8f7364f197cb723b29b..f50602507530fb6ef0e7fe587ed26ffd4733dc7e 100644
--- a/miosix_np_2/nbproject/configurations.xml
+++ b/miosix_np_2/nbproject/configurations.xml
@@ -488,8 +488,8 @@
               <pElem>..</pElem>
               <pElem>../miosix</pElem>
               <pElem>../miosix/arch/common</pElem>
-              <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-              <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval</pElem>
+              <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+              <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval</pElem>
               <pElem>../miosix/arch/cortexM4_stm32/common</pElem>
               <pElem>../miosix/arch/cortexM4_stm32/stm32f407vg_stm32f4discovery</pElem>
               <pElem>../miosix/arch/arm7_lpc2000/common</pElem>
@@ -506,8 +506,8 @@
               <pElem>..</pElem>
               <pElem>../miosix</pElem>
               <pElem>../miosix/arch/common</pElem>
-              <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-              <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval</pElem>
+              <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+              <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval</pElem>
               <pElem>../miosix/arch/cortexM4_stm32/common</pElem>
               <pElem>../miosix/arch/cortexM4_stm32/stm32f407vg_stm32f4discovery</pElem>
               <pElem>../miosix/arch/arm7_lpc2000/common</pElem>
@@ -618,137 +618,137 @@
             tool="3"
             flavor2="0">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/common/arch_settings.h"
+      <item path="../miosix/arch/cortexM3_stm32f1/common/arch_settings.h"
             ex="false"
             tool="3"
             flavor2="0">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/common/interfaces-impl/arch_registers_impl.h"
+      <item path="../miosix/arch/cortexM3_stm32f1/common/interfaces-impl/arch_registers_impl.h"
             ex="false"
             tool="3"
             flavor2="0">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/common/interfaces-impl/atomic_ops_impl.h"
+      <item path="../miosix/arch/cortexM3_stm32f1/common/interfaces-impl/atomic_ops_impl.h"
             ex="false"
             tool="3"
             flavor2="0">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/common/interfaces-impl/delays.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/common/interfaces-impl/delays.cpp"
             ex="false"
             tool="1"
             flavor2="0">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/common/interfaces-impl/endianness_impl.h"
+      <item path="../miosix/arch/cortexM3_stm32f1/common/interfaces-impl/endianness_impl.h"
             ex="false"
             tool="3"
             flavor2="0">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/common/interfaces-impl/gpio_impl.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/common/interfaces-impl/gpio_impl.cpp"
             ex="false"
             tool="1"
             flavor2="0">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/common/interfaces-impl/gpio_impl.h"
+      <item path="../miosix/arch/cortexM3_stm32f1/common/interfaces-impl/gpio_impl.h"
             ex="false"
             tool="3"
             flavor2="0">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/common/interfaces-impl/portability.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/common/interfaces-impl/portability.cpp"
             ex="false"
             tool="1"
             flavor2="0">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/common/interfaces-impl/portability_impl.h"
+      <item path="../miosix/arch/cortexM3_stm32f1/common/interfaces-impl/portability_impl.h"
             ex="false"
             tool="3"
             flavor2="0">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery/core/stage_1_boot.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery/core/stage_1_boot.cpp"
             ex="false"
             tool="1"
             flavor2="0">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery/interfaces-impl/bsp.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery/interfaces-impl/bsp.cpp"
             ex="false"
             tool="1"
             flavor2="0">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery/interfaces-impl/bsp_impl.h"
+      <item path="../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery/interfaces-impl/bsp_impl.h"
             ex="false"
             tool="3"
             flavor2="0">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2/core/stage_1_boot.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2/core/stage_1_boot.cpp"
             ex="false"
             tool="1"
             flavor2="0">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2/interfaces-impl/bsp.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2/interfaces-impl/bsp.cpp"
             ex="false"
             tool="1"
             flavor2="0">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2/interfaces-impl/bsp_impl.h"
+      <item path="../miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2/interfaces-impl/bsp_impl.h"
             ex="false"
             tool="3"
             flavor2="0">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2/interfaces-impl/hwmapping.h"
+      <item path="../miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2/interfaces-impl/hwmapping.h"
             ex="false"
             tool="3"
             flavor2="0">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini/core/stage_1_boot.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini/core/stage_1_boot.cpp"
             ex="false"
             tool="1"
             flavor2="0">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini/interfaces-impl/bsp.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini/interfaces-impl/bsp.cpp"
             ex="false"
             tool="1"
             flavor2="0">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini/interfaces-impl/bsp_impl.h"
+      <item path="../miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini/interfaces-impl/bsp_impl.h"
             ex="false"
             tool="3"
             flavor2="0">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini/interfaces-impl/hwmapping.h"
+      <item path="../miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini/interfaces-impl/hwmapping.h"
             ex="false"
             tool="3"
             flavor2="0">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2/core/stage_1_boot.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2/core/stage_1_boot.cpp"
             ex="false"
             tool="1"
             flavor2="0">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2/interfaces-impl/bsp.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2/interfaces-impl/bsp.cpp"
             ex="false"
             tool="1"
             flavor2="0">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2/interfaces-impl/bsp_impl.h"
+      <item path="../miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2/interfaces-impl/bsp_impl.h"
             ex="false"
             tool="3"
             flavor2="0">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2/interfaces-impl/hwmapping.h"
+      <item path="../miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2/interfaces-impl/hwmapping.h"
             ex="false"
             tool="3"
             flavor2="0">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval/core/stage_1_boot.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval/core/stage_1_boot.cpp"
             ex="false"
             tool="1"
             flavor2="0">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval/interfaces-impl/bsp.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval/interfaces-impl/bsp.cpp"
             ex="false"
             tool="1"
             flavor2="0">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval/interfaces-impl/bsp_impl.h"
+      <item path="../miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval/interfaces-impl/bsp_impl.h"
             ex="false"
             tool="3"
             flavor2="0">
@@ -1795,11 +1795,11 @@
         <ccTool>
           <incDir>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
             <pElem>..</pElem>
           </incDir>
@@ -1823,12 +1823,12 @@
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/arch/common/drivers</pElem>
             <pElem>../miosix/filesystem/devfs</pElem>
             <pElem>../miosix/arch/common/CMSIS/Device/ST/STM32F10x/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/interfaces</pElem>
@@ -1848,15 +1848,15 @@
             <pElem>../miosix/arch/common/drivers</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/filesystem/devfs</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/arch/common/CMSIS/Device/ST/STM32F10x/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/filesystem</pElem>
@@ -1866,7 +1866,7 @@
           </incDir>
         </ccTool>
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/common/interfaces-impl/delays.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/common/interfaces-impl/delays.cpp"
             ex="false"
             tool="1"
             flavor2="0">
@@ -1877,7 +1877,7 @@
           </incDir>
         </ccTool>
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/common/interfaces-impl/portability.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/common/interfaces-impl/portability.cpp"
             ex="false"
             tool="1"
             flavor2="0">
@@ -1889,8 +1889,8 @@
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
@@ -1900,12 +1900,12 @@
           </incDir>
         </ccTool>
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval/core/stage_1_boot.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval/core/stage_1_boot.cpp"
             ex="false"
             tool="1"
             flavor2="0">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval/interfaces-impl/bsp.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval/interfaces-impl/bsp.cpp"
             ex="false"
             tool="1"
             flavor2="0">
@@ -1933,8 +1933,8 @@
           <incDir>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
             <pElem>../miosix</pElem>
@@ -1950,8 +1950,8 @@
             <pElem>../miosix/kernel</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
             <pElem>../miosix/filesystem</pElem>
@@ -1967,15 +1967,15 @@
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/filesystem</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix</pElem>
@@ -1987,12 +1987,12 @@
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/util</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix</pElem>
           </incDir>
@@ -2006,8 +2006,8 @@
           <incDir>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
             <pElem>../miosix</pElem>
@@ -2020,11 +2020,11 @@
             <pElem>../miosix/filesystem</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix</pElem>
@@ -2040,15 +2040,15 @@
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/filesystem</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/filesystem/mountpointfs</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
             <pElem>../miosix/filesystem/devfs</pElem>
             <pElem>../miosix/filesystem/console</pElem>
             <pElem>../miosix/filesystem/fat32</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix</pElem>
@@ -2077,10 +2077,10 @@
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/filesystem/console</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
@@ -2094,12 +2094,12 @@
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
@@ -2113,13 +2113,13 @@
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/interfaces</pElem>
@@ -2137,13 +2137,13 @@
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
             <pElem>../miosix/filesystem/console</pElem>
             <pElem>../miosix/util</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix</pElem>
@@ -2160,12 +2160,12 @@
             <pElem>../miosix/filesystem</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/interfaces</pElem>
@@ -2182,12 +2182,12 @@
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
             <pElem>../miosix/filesystem/console</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
@@ -2206,8 +2206,8 @@
         <ccTool>
           <incDir>
             <pElem>../miosix/kernel</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
@@ -2229,11 +2229,11 @@
             <pElem>../miosix/arch/common/core</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
             <pElem>../miosix/filesystem/console</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/interfaces</pElem>
@@ -2241,17 +2241,17 @@
           </incDir>
         </ccTool>
       </folder>
-      <folder path="0/miosix/arch/cortexM3_stm32/common">
+      <folder path="0/miosix/arch/cortexM3_stm32f1/common">
         <ccTool>
           <incDir>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
           </incDir>
         </ccTool>
       </folder>
-      <folder path="0/miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval/core">
+      <folder path="0/miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval/core">
         <ccTool>
           <incDir>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval/core</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval/core</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
             <pElem>../miosix/arch/common/CMSIS/Device/ST/STM32F10x/Include</pElem>
             <pElem>../miosix/arch/common/core</pElem>
@@ -2259,20 +2259,20 @@
           </incDir>
         </ccTool>
       </folder>
-      <folder path="0/miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval/interfaces-impl">
+      <folder path="0/miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval/interfaces-impl">
         <ccTool>
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval/interfaces-impl</pElem>
             <pElem>../miosix/filesystem</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/arch/common/CMSIS/Device/ST/STM32F10x/Include</pElem>
             <pElem>../miosix/filesystem/console</pElem>
             <pElem>../miosix/arch/common/drivers</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/interfaces</pElem>
@@ -2287,14 +2287,14 @@
             <pElem>../miosix/filesystem/console</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/filesystem/devfs</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix</pElem>
@@ -2308,14 +2308,14 @@
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/filesystem</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix</pElem>
@@ -2336,11 +2336,11 @@
             <pElem>../miosix/filesystem</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix</pElem>
@@ -2354,13 +2354,13 @@
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_stm3210e-eval</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_stm3210e-eval</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix</pElem>
           </incDir>
         </ccTool>
@@ -2412,11 +2412,11 @@
         <ccTool>
           <incDir>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
             <pElem>..</pElem>
           </incDir>
@@ -2440,15 +2440,15 @@
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/arch/common/drivers</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
             <pElem>../miosix/filesystem/devfs</pElem>
             <pElem>../miosix/arch/common/CMSIS/Device/ST/STM32F10x/Include</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/interfaces</pElem>
@@ -2468,15 +2468,15 @@
             <pElem>../miosix/arch/common/drivers</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/filesystem/devfs</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/arch/common/CMSIS/Device/ST/STM32F10x/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/filesystem</pElem>
@@ -2486,7 +2486,7 @@
           </incDir>
         </ccTool>
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/common/interfaces-impl/delays.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/common/interfaces-impl/delays.cpp"
             ex="false"
             tool="1"
             flavor2="0">
@@ -2497,7 +2497,7 @@
           </incDir>
         </ccTool>
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/common/interfaces-impl/portability.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/common/interfaces-impl/portability.cpp"
             ex="false"
             tool="1"
             flavor2="0">
@@ -2509,8 +2509,8 @@
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
@@ -2520,12 +2520,12 @@
           </incDir>
         </ccTool>
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2/core/stage_1_boot.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2/core/stage_1_boot.cpp"
             ex="false"
             tool="1"
             flavor2="0">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2/interfaces-impl/bsp.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2/interfaces-impl/bsp.cpp"
             ex="false"
             tool="1"
             flavor2="0">
@@ -2553,8 +2553,8 @@
           <incDir>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
             <pElem>../miosix</pElem>
@@ -2570,8 +2570,8 @@
             <pElem>../miosix/kernel</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
             <pElem>../miosix/filesystem</pElem>
@@ -2587,15 +2587,15 @@
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/filesystem</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix</pElem>
@@ -2607,12 +2607,12 @@
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/util</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix</pElem>
           </incDir>
@@ -2626,8 +2626,8 @@
           <incDir>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
             <pElem>../miosix</pElem>
@@ -2640,11 +2640,11 @@
             <pElem>../miosix/filesystem</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix</pElem>
@@ -2660,15 +2660,15 @@
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/filesystem</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/filesystem/mountpointfs</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
             <pElem>../miosix/filesystem/devfs</pElem>
             <pElem>../miosix/filesystem/console</pElem>
             <pElem>../miosix/filesystem/fat32</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix</pElem>
@@ -2697,10 +2697,10 @@
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/filesystem/console</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
@@ -2714,12 +2714,12 @@
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
@@ -2733,13 +2733,13 @@
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/interfaces</pElem>
@@ -2757,13 +2757,13 @@
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
             <pElem>../miosix/filesystem/console</pElem>
             <pElem>../miosix/util</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix</pElem>
@@ -2780,12 +2780,12 @@
             <pElem>../miosix/filesystem</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/interfaces</pElem>
@@ -2802,12 +2802,12 @@
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
             <pElem>../miosix/filesystem/console</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
@@ -2826,8 +2826,8 @@
         <ccTool>
           <incDir>
             <pElem>../miosix/kernel</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
@@ -2849,11 +2849,11 @@
             <pElem>../miosix/arch/common/core</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
             <pElem>../miosix/filesystem/console</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/interfaces</pElem>
@@ -2861,37 +2861,37 @@
           </incDir>
         </ccTool>
       </folder>
-      <folder path="0/miosix/arch/cortexM3_stm32/common">
+      <folder path="0/miosix/arch/cortexM3_stm32f1/common">
         <ccTool>
           <incDir>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
           </incDir>
         </ccTool>
       </folder>
-      <folder path="0/miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2/core">
+      <folder path="0/miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2/core">
         <ccTool>
           <incDir>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2/core</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2/core</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
             <pElem>../miosix/arch/common/core</pElem>
             <pElem>../miosix</pElem>
           </incDir>
         </ccTool>
       </folder>
-      <folder path="0/miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2/interfaces-impl">
+      <folder path="0/miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2/interfaces-impl">
         <ccTool>
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2/interfaces-impl</pElem>
             <pElem>../miosix/filesystem</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/arch/common/CMSIS/Device/ST/STM32F10x/Include</pElem>
             <pElem>../miosix/filesystem/console</pElem>
             <pElem>../miosix/arch/common/drivers</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/interfaces</pElem>
@@ -2906,14 +2906,14 @@
             <pElem>../miosix/filesystem/console</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/filesystem/devfs</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix</pElem>
@@ -2927,14 +2927,14 @@
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/filesystem</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix</pElem>
@@ -2955,11 +2955,11 @@
             <pElem>../miosix/filesystem</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix</pElem>
@@ -2973,13 +2973,13 @@
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_mp3v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_mp3v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix</pElem>
           </incDir>
         </ccTool>
@@ -3031,11 +3031,11 @@
         <ccTool>
           <incDir>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
             <pElem>..</pElem>
           </incDir>
@@ -3056,7 +3056,7 @@
             tool="1"
             flavor2="0">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/common/interfaces-impl/delays.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/common/interfaces-impl/delays.cpp"
             ex="false"
             tool="1"
             flavor2="0">
@@ -3067,7 +3067,7 @@
           </incDir>
         </ccTool>
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/common/interfaces-impl/portability.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/common/interfaces-impl/portability.cpp"
             ex="false"
             tool="1"
             flavor2="0">
@@ -3079,8 +3079,8 @@
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
@@ -3090,12 +3090,12 @@
           </incDir>
         </ccTool>
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery/core/stage_1_boot.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery/core/stage_1_boot.cpp"
             ex="false"
             tool="1"
             flavor2="0">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery/interfaces-impl/bsp.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery/interfaces-impl/bsp.cpp"
             ex="false"
             tool="1"
             flavor2="0">
@@ -3121,11 +3121,11 @@
             <pElem>../miosix/filesystem</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix</pElem>
@@ -3141,15 +3141,15 @@
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/filesystem</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/filesystem/mountpointfs</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
             <pElem>../miosix/filesystem/devfs</pElem>
             <pElem>../miosix/filesystem/console</pElem>
             <pElem>../miosix/filesystem/fat32</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix</pElem>
@@ -3173,10 +3173,10 @@
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/filesystem/console</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
@@ -3190,12 +3190,12 @@
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
@@ -3209,13 +3209,13 @@
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/interfaces</pElem>
@@ -3233,13 +3233,13 @@
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
             <pElem>../miosix/filesystem/console</pElem>
             <pElem>../miosix/util</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix</pElem>
@@ -3256,12 +3256,12 @@
             <pElem>../miosix/filesystem</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/interfaces</pElem>
@@ -3278,12 +3278,12 @@
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
             <pElem>../miosix/filesystem/console</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
@@ -3295,8 +3295,8 @@
         <ccTool>
           <incDir>
             <pElem>../miosix/kernel</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
@@ -3318,11 +3318,11 @@
             <pElem>../miosix/arch/common/core</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
             <pElem>../miosix/filesystem/console</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/interfaces</pElem>
@@ -3336,15 +3336,15 @@
             <pElem>../miosix/arch/common/drivers</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/filesystem/devfs</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/arch/common/CMSIS/Device/ST/STM32F10x/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/filesystem</pElem>
@@ -3354,17 +3354,17 @@
           </incDir>
         </ccTool>
       </folder>
-      <folder path="0/miosix/arch/cortexM3_stm32/common">
+      <folder path="0/miosix/arch/cortexM3_stm32f1/common">
         <ccTool>
           <incDir>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
           </incDir>
         </ccTool>
       </folder>
-      <folder path="0/miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery/core">
+      <folder path="0/miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery/core">
         <ccTool>
           <incDir>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery/core</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery/core</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
             <pElem>../miosix/arch/common/CMSIS/Device/ST/STM32F10x/Include</pElem>
             <pElem>../miosix/arch/common/core</pElem>
@@ -3372,11 +3372,11 @@
           </incDir>
         </ccTool>
       </folder>
-      <folder path="0/miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery/interfaces-impl">
+      <folder path="0/miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery/interfaces-impl">
         <ccTool>
           <incDir>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery/interfaces-impl</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
             <pElem>../miosix/filesystem</pElem>
@@ -3384,8 +3384,8 @@
             <pElem>../miosix/arch/common/CMSIS/Device/ST/STM32F10x/Include</pElem>
             <pElem>../miosix/filesystem/console</pElem>
             <pElem>../miosix/arch/common/drivers</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/interfaces</pElem>
@@ -3400,14 +3400,14 @@
             <pElem>../miosix/filesystem/console</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/filesystem/devfs</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix</pElem>
@@ -3421,14 +3421,14 @@
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/filesystem</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix</pElem>
@@ -3442,13 +3442,13 @@
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix</pElem>
           </incDir>
         </ccTool>
@@ -3500,11 +3500,11 @@
         <ccTool>
           <incDir>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
             <pElem>..</pElem>
           </incDir>
@@ -3528,15 +3528,15 @@
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/arch/common/drivers</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
             <pElem>../miosix/filesystem/devfs</pElem>
             <pElem>../miosix/arch/common/CMSIS/Device/ST/STM32F10x/Include</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/interfaces</pElem>
@@ -3556,15 +3556,15 @@
             <pElem>../miosix/arch/common/drivers</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/filesystem/devfs</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/arch/common/CMSIS/Device/ST/STM32F10x/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/filesystem</pElem>
@@ -3574,7 +3574,7 @@
           </incDir>
         </ccTool>
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/common/interfaces-impl/delays.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/common/interfaces-impl/delays.cpp"
             ex="false"
             tool="1"
             flavor2="0">
@@ -3585,7 +3585,7 @@
           </incDir>
         </ccTool>
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/common/interfaces-impl/portability.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/common/interfaces-impl/portability.cpp"
             ex="false"
             tool="1"
             flavor2="0">
@@ -3597,8 +3597,8 @@
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
@@ -3608,12 +3608,12 @@
           </incDir>
         </ccTool>
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini/core/stage_1_boot.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini/core/stage_1_boot.cpp"
             ex="false"
             tool="1"
             flavor2="0">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini/interfaces-impl/bsp.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini/interfaces-impl/bsp.cpp"
             ex="false"
             tool="1"
             flavor2="0">
@@ -3641,8 +3641,8 @@
           <incDir>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
             <pElem>../miosix</pElem>
@@ -3658,8 +3658,8 @@
             <pElem>../miosix/kernel</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
             <pElem>../miosix/filesystem</pElem>
@@ -3675,15 +3675,15 @@
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/filesystem</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix</pElem>
@@ -3695,12 +3695,12 @@
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/util</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix</pElem>
           </incDir>
@@ -3714,8 +3714,8 @@
           <incDir>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
             <pElem>../miosix</pElem>
@@ -3728,11 +3728,11 @@
             <pElem>../miosix/filesystem</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix</pElem>
@@ -3748,15 +3748,15 @@
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/filesystem</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/filesystem/mountpointfs</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
             <pElem>../miosix/filesystem/devfs</pElem>
             <pElem>../miosix/filesystem/console</pElem>
             <pElem>../miosix/filesystem/fat32</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix</pElem>
@@ -3785,10 +3785,10 @@
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/filesystem/console</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
@@ -3802,12 +3802,12 @@
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
@@ -3821,13 +3821,13 @@
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/interfaces</pElem>
@@ -3845,13 +3845,13 @@
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
             <pElem>../miosix/filesystem/console</pElem>
             <pElem>../miosix/util</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix</pElem>
@@ -3868,12 +3868,12 @@
             <pElem>../miosix/filesystem</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/interfaces</pElem>
@@ -3890,12 +3890,12 @@
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
             <pElem>../miosix/filesystem/console</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
@@ -3914,8 +3914,8 @@
         <ccTool>
           <incDir>
             <pElem>../miosix/kernel</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
@@ -3937,11 +3937,11 @@
             <pElem>../miosix/arch/common/core</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
             <pElem>../miosix/filesystem/console</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/interfaces</pElem>
@@ -3949,17 +3949,17 @@
           </incDir>
         </ccTool>
       </folder>
-      <folder path="0/miosix/arch/cortexM3_stm32/common">
+      <folder path="0/miosix/arch/cortexM3_stm32f1/common">
         <ccTool>
           <incDir>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
           </incDir>
         </ccTool>
       </folder>
-      <folder path="0/miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini/core">
+      <folder path="0/miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini/core">
         <ccTool>
           <incDir>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini/core</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini/core</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
             <pElem>../miosix/arch/common/CMSIS/Device/ST/STM32F10x/Include</pElem>
             <pElem>../miosix/arch/common/core</pElem>
@@ -3967,20 +3967,20 @@
           </incDir>
         </ccTool>
       </folder>
-      <folder path="0/miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini/interfaces-impl">
+      <folder path="0/miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini/interfaces-impl">
         <ccTool>
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini/interfaces-impl</pElem>
             <pElem>../miosix/filesystem</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/arch/common/CMSIS/Device/ST/STM32F10x/Include</pElem>
             <pElem>../miosix/filesystem/console</pElem>
             <pElem>../miosix/arch/common/drivers</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/interfaces</pElem>
@@ -3995,14 +3995,14 @@
             <pElem>../miosix/filesystem/console</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/filesystem/devfs</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix</pElem>
@@ -4016,14 +4016,14 @@
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/filesystem</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix</pElem>
@@ -4044,11 +4044,11 @@
             <pElem>../miosix/filesystem</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix</pElem>
@@ -4062,13 +4062,13 @@
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ve_strive_mini</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ve_strive_mini</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix</pElem>
           </incDir>
         </ccTool>
@@ -4120,11 +4120,11 @@
         <ccTool>
           <incDir>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
             <pElem>..</pElem>
           </incDir>
@@ -4148,15 +4148,15 @@
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/arch/common/drivers</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
             <pElem>../miosix/filesystem/devfs</pElem>
             <pElem>../miosix/arch/common/CMSIS/Device/ST/STM32F10x/Include</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/interfaces</pElem>
@@ -4176,15 +4176,15 @@
             <pElem>../miosix/arch/common/drivers</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/filesystem/devfs</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/arch/common/CMSIS/Device/ST/STM32F10x/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/filesystem</pElem>
@@ -4194,7 +4194,7 @@
           </incDir>
         </ccTool>
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/common/interfaces-impl/delays.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/common/interfaces-impl/delays.cpp"
             ex="false"
             tool="1"
             flavor2="0">
@@ -4205,7 +4205,7 @@
           </incDir>
         </ccTool>
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/common/interfaces-impl/portability.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/common/interfaces-impl/portability.cpp"
             ex="false"
             tool="1"
             flavor2="0">
@@ -4217,8 +4217,8 @@
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
@@ -4228,12 +4228,12 @@
           </incDir>
         </ccTool>
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2/core/stage_1_boot.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2/core/stage_1_boot.cpp"
             ex="false"
             tool="1"
             flavor2="0">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2/interfaces-impl/bsp.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2/interfaces-impl/bsp.cpp"
             ex="false"
             tool="1"
             flavor2="0">
@@ -4261,8 +4261,8 @@
           <incDir>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
             <pElem>../miosix</pElem>
@@ -4278,8 +4278,8 @@
             <pElem>../miosix/kernel</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
             <pElem>../miosix/filesystem</pElem>
@@ -4295,15 +4295,15 @@
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/filesystem</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix</pElem>
@@ -4315,12 +4315,12 @@
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/util</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix</pElem>
           </incDir>
@@ -4334,8 +4334,8 @@
           <incDir>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
             <pElem>../miosix</pElem>
@@ -4348,11 +4348,11 @@
             <pElem>../miosix/filesystem</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix</pElem>
@@ -4368,15 +4368,15 @@
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/filesystem</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/filesystem/mountpointfs</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
             <pElem>../miosix/filesystem/devfs</pElem>
             <pElem>../miosix/filesystem/console</pElem>
             <pElem>../miosix/filesystem/fat32</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix</pElem>
@@ -4405,10 +4405,10 @@
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/filesystem/console</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
@@ -4422,12 +4422,12 @@
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
@@ -4441,13 +4441,13 @@
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/interfaces</pElem>
@@ -4465,13 +4465,13 @@
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
             <pElem>../miosix/filesystem/console</pElem>
             <pElem>../miosix/util</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix</pElem>
@@ -4488,12 +4488,12 @@
             <pElem>../miosix/filesystem</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/interfaces</pElem>
@@ -4510,12 +4510,12 @@
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
             <pElem>../miosix/filesystem/console</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
@@ -4534,8 +4534,8 @@
         <ccTool>
           <incDir>
             <pElem>../miosix/kernel</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
@@ -4557,11 +4557,11 @@
             <pElem>../miosix/arch/common/core</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
             <pElem>../miosix/filesystem/console</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/interfaces</pElem>
@@ -4569,17 +4569,17 @@
           </incDir>
         </ccTool>
       </folder>
-      <folder path="0/miosix/arch/cortexM3_stm32/common">
+      <folder path="0/miosix/arch/cortexM3_stm32f1/common">
         <ccTool>
           <incDir>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
           </incDir>
         </ccTool>
       </folder>
-      <folder path="0/miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2/core">
+      <folder path="0/miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2/core">
         <ccTool>
           <incDir>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2/core</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2/core</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
             <pElem>../miosix/arch/common/CMSIS/Device/ST/STM32F10x/Include</pElem>
             <pElem>../miosix/arch/common/core</pElem>
@@ -4587,20 +4587,20 @@
           </incDir>
         </ccTool>
       </folder>
-      <folder path="0/miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2/interfaces-impl">
+      <folder path="0/miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2/interfaces-impl">
         <ccTool>
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2/interfaces-impl</pElem>
             <pElem>../miosix/filesystem</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/arch/common/CMSIS/Device/ST/STM32F10x/Include</pElem>
             <pElem>../miosix/filesystem/console</pElem>
             <pElem>../miosix/arch/common/drivers</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/interfaces</pElem>
@@ -4615,14 +4615,14 @@
             <pElem>../miosix/filesystem/console</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/filesystem/devfs</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix</pElem>
@@ -4636,14 +4636,14 @@
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/filesystem</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix</pElem>
@@ -4664,11 +4664,11 @@
             <pElem>../miosix/filesystem</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix</pElem>
@@ -4682,13 +4682,13 @@
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f103ze_redbull_v2</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f103ze_redbull_v2</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix</pElem>
           </incDir>
         </ccTool>
@@ -9379,11 +9379,11 @@
         <ccTool>
           <incDir>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
             <pElem>..</pElem>
           </incDir>
@@ -9404,7 +9404,7 @@
             tool="1"
             flavor2="9">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/common/interfaces-impl/delays.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/common/interfaces-impl/delays.cpp"
             ex="false"
             tool="1"
             flavor2="9">
@@ -9415,7 +9415,7 @@
           </incDir>
         </ccTool>
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/common/interfaces-impl/portability.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/common/interfaces-impl/portability.cpp"
             ex="false"
             tool="1"
             flavor2="9">
@@ -9427,8 +9427,8 @@
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
@@ -9438,32 +9438,32 @@
           </incDir>
         </ccTool>
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery/core/stage_1_boot.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery/core/stage_1_boot.cpp"
             ex="false"
             tool="1"
             flavor2="9">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery/interfaces-impl/bsp.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery/interfaces-impl/bsp.cpp"
             ex="false"
             tool="1"
             flavor2="9">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/stm32f103cb_als_mainboard_rev2/core/stage_1_boot.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/stm32f103cb_als_mainboard_rev2/core/stage_1_boot.cpp"
             ex="false"
             tool="1"
             flavor2="9">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/stm32f103cb_als_mainboard_rev2/interfaces-impl/bsp.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/stm32f103cb_als_mainboard_rev2/interfaces-impl/bsp.cpp"
             ex="false"
             tool="1"
             flavor2="9">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/stm32f103cb_als_mainboard_rev2/interfaces-impl/bsp_impl.h"
+      <item path="../miosix/arch/cortexM3_stm32f1/stm32f103cb_als_mainboard_rev2/interfaces-impl/bsp_impl.h"
             ex="false"
             tool="3"
             flavor2="0">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/stm32f103cb_als_mainboard_rev2/interfaces-impl/hwmapping.h"
+      <item path="../miosix/arch/cortexM3_stm32f1/stm32f103cb_als_mainboard_rev2/interfaces-impl/hwmapping.h"
             ex="false"
             tool="3"
             flavor2="0">
@@ -9489,11 +9489,11 @@
             <pElem>../miosix/filesystem</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix</pElem>
@@ -9509,15 +9509,15 @@
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/filesystem</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/filesystem/mountpointfs</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
             <pElem>../miosix/filesystem/devfs</pElem>
             <pElem>../miosix/filesystem/console</pElem>
             <pElem>../miosix/filesystem/fat32</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix</pElem>
@@ -9541,10 +9541,10 @@
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/filesystem/console</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
@@ -9558,12 +9558,12 @@
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
@@ -9577,13 +9577,13 @@
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/interfaces</pElem>
@@ -9601,13 +9601,13 @@
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
             <pElem>../miosix/filesystem/console</pElem>
             <pElem>../miosix/util</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix</pElem>
@@ -9624,12 +9624,12 @@
             <pElem>../miosix/filesystem</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/interfaces</pElem>
@@ -9646,12 +9646,12 @@
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
             <pElem>../miosix/filesystem/console</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
@@ -9663,8 +9663,8 @@
         <ccTool>
           <incDir>
             <pElem>../miosix/kernel</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
@@ -9686,11 +9686,11 @@
             <pElem>../miosix/arch/common/core</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
             <pElem>../miosix/filesystem/console</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/interfaces</pElem>
@@ -9704,15 +9704,15 @@
             <pElem>../miosix/arch/common/drivers</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/filesystem/devfs</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/arch/common/CMSIS/Device/ST/STM32F10x/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/filesystem</pElem>
@@ -9722,17 +9722,17 @@
           </incDir>
         </ccTool>
       </folder>
-      <folder path="0/miosix/arch/cortexM3_stm32/common">
+      <folder path="0/miosix/arch/cortexM3_stm32f1/common">
         <ccTool>
           <incDir>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
           </incDir>
         </ccTool>
       </folder>
-      <folder path="0/miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery/core">
+      <folder path="0/miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery/core">
         <ccTool>
           <incDir>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery/core</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery/core</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
             <pElem>../miosix/arch/common/CMSIS/Device/ST/STM32F10x/Include</pElem>
             <pElem>../miosix/arch/common/core</pElem>
@@ -9740,11 +9740,11 @@
           </incDir>
         </ccTool>
       </folder>
-      <folder path="0/miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery/interfaces-impl">
+      <folder path="0/miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery/interfaces-impl">
         <ccTool>
           <incDir>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery/interfaces-impl</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
             <pElem>../miosix/filesystem</pElem>
@@ -9752,8 +9752,8 @@
             <pElem>../miosix/arch/common/CMSIS/Device/ST/STM32F10x/Include</pElem>
             <pElem>../miosix/filesystem/console</pElem>
             <pElem>../miosix/arch/common/drivers</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/interfaces</pElem>
@@ -9768,14 +9768,14 @@
             <pElem>../miosix/filesystem/console</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/filesystem/devfs</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix</pElem>
@@ -9789,14 +9789,14 @@
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/filesystem</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix</pElem>
@@ -9810,13 +9810,13 @@
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix</pElem>
           </incDir>
         </ccTool>
@@ -9868,11 +9868,11 @@
         <ccTool>
           <incDir>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
             <pElem>..</pElem>
           </incDir>
@@ -9893,7 +9893,7 @@
             tool="1"
             flavor2="9">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/common/interfaces-impl/delays.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/common/interfaces-impl/delays.cpp"
             ex="false"
             tool="1"
             flavor2="9">
@@ -9904,7 +9904,7 @@
           </incDir>
         </ccTool>
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/common/interfaces-impl/portability.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/common/interfaces-impl/portability.cpp"
             ex="false"
             tool="1"
             flavor2="9">
@@ -9916,8 +9916,8 @@
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
@@ -9927,27 +9927,27 @@
           </incDir>
         </ccTool>
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/stm32f100cb_tempsensor/core/stage_1_boot.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/stm32f100cb_tempsensor/core/stage_1_boot.cpp"
             ex="false"
             tool="1"
             flavor2="9">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/stm32f100cb_tempsensor/interfaces-impl/bsp.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/stm32f100cb_tempsensor/interfaces-impl/bsp.cpp"
             ex="false"
             tool="1"
             flavor2="9">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/stm32f100cb_tempsensor/interfaces-impl/bsp_impl.h"
+      <item path="../miosix/arch/cortexM3_stm32f1/stm32f100cb_tempsensor/interfaces-impl/bsp_impl.h"
             ex="false"
             tool="3"
             flavor2="0">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery/core/stage_1_boot.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery/core/stage_1_boot.cpp"
             ex="false"
             tool="1"
             flavor2="9">
       </item>
-      <item path="../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery/interfaces-impl/bsp.cpp"
+      <item path="../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery/interfaces-impl/bsp.cpp"
             ex="false"
             tool="1"
             flavor2="9">
@@ -9973,11 +9973,11 @@
             <pElem>../miosix/filesystem</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix</pElem>
@@ -9993,15 +9993,15 @@
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/filesystem</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/filesystem/mountpointfs</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
             <pElem>../miosix/filesystem/devfs</pElem>
             <pElem>../miosix/filesystem/console</pElem>
             <pElem>../miosix/filesystem/fat32</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix</pElem>
@@ -10025,10 +10025,10 @@
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/filesystem/console</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
@@ -10042,12 +10042,12 @@
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
@@ -10061,13 +10061,13 @@
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/interfaces</pElem>
@@ -10085,13 +10085,13 @@
           <incDir>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
             <pElem>../miosix/filesystem/console</pElem>
             <pElem>../miosix/util</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix</pElem>
@@ -10108,12 +10108,12 @@
             <pElem>../miosix/filesystem</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/interfaces</pElem>
@@ -10130,12 +10130,12 @@
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
             <pElem>../miosix/filesystem/console</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
@@ -10147,8 +10147,8 @@
         <ccTool>
           <incDir>
             <pElem>../miosix/kernel</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
@@ -10170,11 +10170,11 @@
             <pElem>../miosix/arch/common/core</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
             <pElem>../miosix/filesystem/console</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/interfaces</pElem>
@@ -10188,15 +10188,15 @@
             <pElem>../miosix/arch/common/drivers</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/filesystem/devfs</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/arch/common/CMSIS/Device/ST/STM32F10x/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/filesystem</pElem>
@@ -10206,17 +10206,17 @@
           </incDir>
         </ccTool>
       </folder>
-      <folder path="0/miosix/arch/cortexM3_stm32/common">
+      <folder path="0/miosix/arch/cortexM3_stm32f1/common">
         <ccTool>
           <incDir>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
           </incDir>
         </ccTool>
       </folder>
-      <folder path="0/miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery/core">
+      <folder path="0/miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery/core">
         <ccTool>
           <incDir>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery/core</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery/core</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
             <pElem>../miosix/arch/common/CMSIS/Device/ST/STM32F10x/Include</pElem>
             <pElem>../miosix/arch/common/core</pElem>
@@ -10224,11 +10224,11 @@
           </incDir>
         </ccTool>
       </folder>
-      <folder path="0/miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery/interfaces-impl">
+      <folder path="0/miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery/interfaces-impl">
         <ccTool>
           <incDir>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery/interfaces-impl</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
             <pElem>../miosix/filesystem</pElem>
@@ -10236,8 +10236,8 @@
             <pElem>../miosix/arch/common/CMSIS/Device/ST/STM32F10x/Include</pElem>
             <pElem>../miosix/filesystem/console</pElem>
             <pElem>../miosix/arch/common/drivers</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix/interfaces</pElem>
@@ -10252,14 +10252,14 @@
             <pElem>../miosix/filesystem/console</pElem>
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix/filesystem/devfs</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix</pElem>
@@ -10273,14 +10273,14 @@
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/filesystem</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/interfaces</pElem>
             <pElem>../miosix/kernel/scheduler/priority</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>../miosix</pElem>
@@ -10294,13 +10294,13 @@
             <pElem>../miosix/kernel</pElem>
             <pElem>../miosix/stdlib_integration</pElem>
             <pElem>../miosix/kernel/scheduler</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/stm32f100rb_stm32vldiscovery</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/stm32f100rb_stm32vldiscovery</pElem>
             <pElem>../miosix/config</pElem>
             <pElem>../miosix/kernel/scheduler/control</pElem>
             <pElem>/opt/arm-miosix-eabi/arm-miosix-eabi/include/c++/4.7.3/arm-miosix-eabi/thumb/cm3/bits</pElem>
             <pElem>../miosix/arch/common/CMSIS/Include</pElem>
-            <pElem>../miosix/arch/cortexM3_stm32/common/interfaces-impl</pElem>
+            <pElem>../miosix/arch/cortexM3_stm32f1/common/interfaces-impl</pElem>
             <pElem>../miosix</pElem>
           </incDir>
         </ccTool>
diff --git a/miosix_np_2/nbproject/private/configurations.xml b/miosix_np_2/nbproject/private/configurations.xml
index d0f4669ee0edd8300904fe12204f9bb16b019aa6..8dca76222f612b0962186d746b1047f25d7ee040 100644
--- a/miosix_np_2/nbproject/private/configurations.xml
+++ b/miosix_np_2/nbproject/private/configurations.xml
@@ -243,7 +243,7 @@
               </df>
             </df>
           </df>
-          <df name="cortexM3_stm32">
+          <df name="cortexM3_stm32f1">
             <df name="common">
               <df name="interfaces-impl">
                 <in>arch_registers_impl.h</in>
@@ -497,7 +497,7 @@
                 <in>board_settings.h</in>
               </df>
             </df>
-            <df name="cortexM3_stm32">
+            <df name="cortexM3_stm32f1">
               <df name="stm32f100cb_tempsensor">
                 <in>board_settings.h</in>
               </df>