diff --git a/conf/Makefile.stm32 b/conf/Makefile.stm32
index 2a58b5bded..8e47c3ffc3 100644
--- a/conf/Makefile.stm32
+++ b/conf/Makefile.stm32
@@ -25,7 +25,7 @@
 # This is the common Makefile for the stm32-target.
 #
 
-SRC_ARCH = stm32
+SRC_ARCH = arch/stm32
 
 # Pretty Printer
 # Call with "make Q=''" to get full command display
diff --git a/sw/airborne/stm32/adc_hw.c b/sw/airborne/arch/stm32/adc_hw.c
similarity index 100%
rename from sw/airborne/stm32/adc_hw.c
rename to sw/airborne/arch/stm32/adc_hw.c
diff --git a/sw/airborne/stm32/adc_hw.h b/sw/airborne/arch/stm32/adc_hw.h
similarity index 100%
rename from sw/airborne/stm32/adc_hw.h
rename to sw/airborne/arch/stm32/adc_hw.h
diff --git a/sw/airborne/stm32/can_hw.c b/sw/airborne/arch/stm32/can_hw.c
similarity index 100%
rename from sw/airborne/stm32/can_hw.c
rename to sw/airborne/arch/stm32/can_hw.c
diff --git a/sw/airborne/stm32/can_hw.c.bak b/sw/airborne/arch/stm32/can_hw.c.bak
similarity index 100%
rename from sw/airborne/stm32/can_hw.c.bak
rename to sw/airborne/arch/stm32/can_hw.c.bak
diff --git a/sw/airborne/stm32/can_hw.h b/sw/airborne/arch/stm32/can_hw.h
similarity index 100%
rename from sw/airborne/stm32/can_hw.h
rename to sw/airborne/arch/stm32/can_hw.h
diff --git a/sw/airborne/stm32/gps_hw.h b/sw/airborne/arch/stm32/gps_hw.h
similarity index 100%
rename from sw/airborne/stm32/gps_hw.h
rename to sw/airborne/arch/stm32/gps_hw.h
diff --git a/sw/airborne/stm32/i2c_hw.c b/sw/airborne/arch/stm32/i2c_hw.c
similarity index 100%
rename from sw/airborne/stm32/i2c_hw.c
rename to sw/airborne/arch/stm32/i2c_hw.c
diff --git a/sw/airborne/stm32/i2c_hw.h b/sw/airborne/arch/stm32/i2c_hw.h
similarity index 100%
rename from sw/airborne/stm32/i2c_hw.h
rename to sw/airborne/arch/stm32/i2c_hw.h
diff --git a/sw/airborne/stm32/init_hw.h b/sw/airborne/arch/stm32/init_hw.h
similarity index 100%
rename from sw/airborne/stm32/init_hw.h
rename to sw/airborne/arch/stm32/init_hw.h
diff --git a/sw/airborne/stm32/interrupt_hw.h b/sw/airborne/arch/stm32/interrupt_hw.h
similarity index 100%
rename from sw/airborne/stm32/interrupt_hw.h
rename to sw/airborne/arch/stm32/interrupt_hw.h
diff --git a/sw/airborne/stm32/led_hw.c b/sw/airborne/arch/stm32/led_hw.c
similarity index 100%
rename from sw/airborne/stm32/led_hw.c
rename to sw/airborne/arch/stm32/led_hw.c
diff --git a/sw/airborne/stm32/led_hw.h b/sw/airborne/arch/stm32/led_hw.h
similarity index 100%
rename from sw/airborne/stm32/led_hw.h
rename to sw/airborne/arch/stm32/led_hw.h
diff --git a/sw/airborne/stm32/link_mcu_hw.h b/sw/airborne/arch/stm32/link_mcu_hw.h
similarity index 100%
rename from sw/airborne/stm32/link_mcu_hw.h
rename to sw/airborne/arch/stm32/link_mcu_hw.h
diff --git a/sw/airborne/stm32/my_debug_servo.h b/sw/airborne/arch/stm32/my_debug_servo.h
similarity index 100%
rename from sw/airborne/stm32/my_debug_servo.h
rename to sw/airborne/arch/stm32/my_debug_servo.h
diff --git a/sw/airborne/stm32/ppm_hw.c b/sw/airborne/arch/stm32/ppm_hw.c
similarity index 100%
rename from sw/airborne/stm32/ppm_hw.c
rename to sw/airborne/arch/stm32/ppm_hw.c
diff --git a/sw/airborne/stm32/ppm_hw.h b/sw/airborne/arch/stm32/ppm_hw.h
similarity index 100%
rename from sw/airborne/stm32/ppm_hw.h
rename to sw/airborne/arch/stm32/ppm_hw.h
diff --git a/sw/airborne/stm32/servos_direct_hw.c b/sw/airborne/arch/stm32/servos_direct_hw.c
similarity index 100%
rename from sw/airborne/stm32/servos_direct_hw.c
rename to sw/airborne/arch/stm32/servos_direct_hw.c
diff --git a/sw/airborne/stm32/servos_direct_hw.h b/sw/airborne/arch/stm32/servos_direct_hw.h
similarity index 100%
rename from sw/airborne/stm32/servos_direct_hw.h
rename to sw/airborne/arch/stm32/servos_direct_hw.h
diff --git a/sw/airborne/stm32/stm32_exceptions.c b/sw/airborne/arch/stm32/stm32_exceptions.c
similarity index 100%
rename from sw/airborne/stm32/stm32_exceptions.c
rename to sw/airborne/arch/stm32/stm32_exceptions.c
diff --git a/sw/airborne/stm32/stm32_exceptions.h b/sw/airborne/arch/stm32/stm32_exceptions.h
similarity index 100%
rename from sw/airborne/stm32/stm32_exceptions.h
rename to sw/airborne/arch/stm32/stm32_exceptions.h
diff --git a/sw/airborne/stm32/stm32_vector_table.c b/sw/airborne/arch/stm32/stm32_vector_table.c
similarity index 100%
rename from sw/airborne/stm32/stm32_vector_table.c
rename to sw/airborne/arch/stm32/stm32_vector_table.c
diff --git a/sw/airborne/stm32/stm32_vector_table.h b/sw/airborne/arch/stm32/stm32_vector_table.h
similarity index 100%
rename from sw/airborne/stm32/stm32_vector_table.h
rename to sw/airborne/arch/stm32/stm32_vector_table.h
diff --git a/sw/airborne/stm32/stm32f103rb_flash.ld b/sw/airborne/arch/stm32/stm32f103rb_flash.ld
similarity index 100%
rename from sw/airborne/stm32/stm32f103rb_flash.ld
rename to sw/airborne/arch/stm32/stm32f103rb_flash.ld
diff --git a/sw/airborne/stm32/stm32f103re_flash.ld b/sw/airborne/arch/stm32/stm32f103re_flash.ld
similarity index 100%
rename from sw/airborne/stm32/stm32f103re_flash.ld
rename to sw/airborne/arch/stm32/stm32f103re_flash.ld
diff --git a/sw/airborne/stm32/sys_time_hw.c b/sw/airborne/arch/stm32/sys_time_hw.c
similarity index 100%
rename from sw/airborne/stm32/sys_time_hw.c
rename to sw/airborne/arch/stm32/sys_time_hw.c
diff --git a/sw/airborne/stm32/sys_time_hw.h b/sw/airborne/arch/stm32/sys_time_hw.h
similarity index 100%
rename from sw/airborne/stm32/sys_time_hw.h
rename to sw/airborne/arch/stm32/sys_time_hw.h
diff --git a/sw/airborne/stm32/uart_hw.c b/sw/airborne/arch/stm32/uart_hw.c
similarity index 100%
rename from sw/airborne/stm32/uart_hw.c
rename to sw/airborne/arch/stm32/uart_hw.c
diff --git a/sw/airborne/stm32/uart_hw.h b/sw/airborne/arch/stm32/uart_hw.h
similarity index 100%
rename from sw/airborne/stm32/uart_hw.h
rename to sw/airborne/arch/stm32/uart_hw.h