diff --git a/lib/stm32f1/Makefile b/lib/stm32/f1/Makefile
similarity index 100%
rename from lib/stm32f1/Makefile
rename to lib/stm32/f1/Makefile
diff --git a/lib/stm32f1/adc.c b/lib/stm32/f1/adc.c
similarity index 100%
rename from lib/stm32f1/adc.c
rename to lib/stm32/f1/adc.c
diff --git a/lib/stm32f1/can.c b/lib/stm32/f1/can.c
similarity index 100%
rename from lib/stm32f1/can.c
rename to lib/stm32/f1/can.c
diff --git a/lib/stm32f1/dma.c b/lib/stm32/f1/dma.c
similarity index 100%
rename from lib/stm32f1/dma.c
rename to lib/stm32/f1/dma.c
diff --git a/lib/stm32f1/ethernet.c b/lib/stm32/f1/ethernet.c
similarity index 100%
rename from lib/stm32f1/ethernet.c
rename to lib/stm32/f1/ethernet.c
diff --git a/lib/stm32f1/exti.c b/lib/stm32/f1/exti.c
similarity index 100%
rename from lib/stm32f1/exti.c
rename to lib/stm32/f1/exti.c
diff --git a/lib/stm32f1/flash.c b/lib/stm32/f1/flash.c
similarity index 100%
rename from lib/stm32f1/flash.c
rename to lib/stm32/f1/flash.c
diff --git a/lib/stm32f1/gpio.c b/lib/stm32/f1/gpio.c
similarity index 100%
rename from lib/stm32f1/gpio.c
rename to lib/stm32/f1/gpio.c
diff --git a/lib/stm32f1/libopencm3_stm32f1.ld b/lib/stm32/f1/libopencm3_stm32f1.ld
similarity index 100%
rename from lib/stm32f1/libopencm3_stm32f1.ld
rename to lib/stm32/f1/libopencm3_stm32f1.ld
diff --git a/lib/stm32f1/rcc.c b/lib/stm32/f1/rcc.c
similarity index 100%
rename from lib/stm32f1/rcc.c
rename to lib/stm32/f1/rcc.c
diff --git a/lib/stm32f1/rtc.c b/lib/stm32/f1/rtc.c
similarity index 100%
rename from lib/stm32f1/rtc.c
rename to lib/stm32/f1/rtc.c
diff --git a/lib/stm32f1/scb.c b/lib/stm32/f1/scb.c
similarity index 100%
rename from lib/stm32f1/scb.c
rename to lib/stm32/f1/scb.c
diff --git a/lib/stm32f1/timer.c b/lib/stm32/f1/timer.c
similarity index 100%
rename from lib/stm32f1/timer.c
rename to lib/stm32/f1/timer.c
diff --git a/lib/stm32f1/vector.c b/lib/stm32/f1/vector.c
similarity index 100%
rename from lib/stm32f1/vector.c
rename to lib/stm32/f1/vector.c
diff --git a/lib/stm32f2/Makefile b/lib/stm32/f2/Makefile
similarity index 100%
rename from lib/stm32f2/Makefile
rename to lib/stm32/f2/Makefile
diff --git a/lib/stm32f2/exti.c b/lib/stm32/f2/exti.c
similarity index 100%
rename from lib/stm32f2/exti.c
rename to lib/stm32/f2/exti.c
diff --git a/lib/stm32f2/flash.c b/lib/stm32/f2/flash.c
similarity index 100%
rename from lib/stm32f2/flash.c
rename to lib/stm32/f2/flash.c
diff --git a/lib/stm32f2/gpio.c b/lib/stm32/f2/gpio.c
similarity index 100%
rename from lib/stm32f2/gpio.c
rename to lib/stm32/f2/gpio.c
diff --git a/lib/stm32f2/libopencm3_stm32f2.ld b/lib/stm32/f2/libopencm3_stm32f2.ld
similarity index 100%
rename from lib/stm32f2/libopencm3_stm32f2.ld
rename to lib/stm32/f2/libopencm3_stm32f2.ld
diff --git a/lib/stm32f2/rcc.c b/lib/stm32/f2/rcc.c
similarity index 100%
rename from lib/stm32f2/rcc.c
rename to lib/stm32/f2/rcc.c
diff --git a/lib/stm32f2/vector.c b/lib/stm32/f2/vector.c
similarity index 100%
rename from lib/stm32f2/vector.c
rename to lib/stm32/f2/vector.c
diff --git a/lib/stm32_common/i2c.c b/lib/stm32/i2c.c
similarity index 100%
rename from lib/stm32_common/i2c.c
rename to lib/stm32/i2c.c
diff --git a/lib/stm32_common/nvic.c b/lib/stm32/nvic.c
similarity index 100%
rename from lib/stm32_common/nvic.c
rename to lib/stm32/nvic.c
diff --git a/lib/stm32_common/spi.c b/lib/stm32/spi.c
similarity index 100%
rename from lib/stm32_common/spi.c
rename to lib/stm32/spi.c
diff --git a/lib/stm32_common/systick.c b/lib/stm32/systick.c
similarity index 100%
rename from lib/stm32_common/systick.c
rename to lib/stm32/systick.c
diff --git a/lib/stm32_common/usart.c b/lib/stm32/usart.c
similarity index 100%
rename from lib/stm32_common/usart.c
rename to lib/stm32/usart.c