diff --git a/examples/stm32f1/Makefile.include b/examples/stm32/f1/Makefile.include
similarity index 96%
rename from examples/stm32f1/Makefile.include
rename to examples/stm32/f1/Makefile.include
index 8420cc8a..cf8644f1 100644
--- a/examples/stm32f1/Makefile.include
+++ b/examples/stm32/f1/Makefile.include
@@ -27,11 +27,11 @@ OBJDUMP		= $(PREFIX)-objdump
 GDB		= $(PREFIX)-gdb
 # Uncomment this line if you want to use the installed (not local) library.
 #TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX)
-TOOLCHAIN_DIR   = ../../../..
+TOOLCHAIN_DIR   = ../../../../..
 CFLAGS		+= -Os -g -Wall -Wextra -I$(TOOLCHAIN_DIR)/include \
 		   -fno-common -mcpu=cortex-m3 -mthumb -msoft-float -MD -DSTM32F1
 LDSCRIPT	= $(BINARY).ld
-LDFLAGS		+= -lc -lnosys -L$(TOOLCHAIN_DIR)/lib -L$(TOOLCHAIN_DIR)/lib/stm32f1 \
+LDFLAGS		+= -lc -lnosys -L$(TOOLCHAIN_DIR)/lib -L$(TOOLCHAIN_DIR)/lib/stm32/f1 \
 		   -T$(LDSCRIPT) -nostartfiles -Wl,--gc-sections \
 		   -mthumb -march=armv7 -mfix-cortex-m3-ldrd -msoft-float
 OBJS		+= $(BINARY).o
@@ -79,7 +79,7 @@ flash: $(BINARY).flash
 	@#printf "  OBJDUMP $(*).list\n"
 	$(Q)$(OBJDUMP) -S $(*).elf > $(*).list
 
-%.elf: $(OBJS) $(LDSCRIPT) $(TOOLCHAIN_DIR)/lib/stm32f1/libopencm3_stm32f1.a
+%.elf: $(OBJS) $(LDSCRIPT) $(TOOLCHAIN_DIR)/lib/stm32/f1/libopencm3_stm32f1.a
 	@#printf "  LD      $(subst $(shell pwd)/,,$(@))\n"
 	$(Q)$(LD) -o $(*).elf $(OBJS) -lopencm3_stm32f1 $(LDFLAGS)
 
diff --git a/examples/stm32f1/lisa-m/fancyblink/Makefile b/examples/stm32/f1/lisa-m/fancyblink/Makefile
similarity index 100%
rename from examples/stm32f1/lisa-m/fancyblink/Makefile
rename to examples/stm32/f1/lisa-m/fancyblink/Makefile
diff --git a/examples/stm32f1/lisa-m/fancyblink/fancyblink.c b/examples/stm32/f1/lisa-m/fancyblink/fancyblink.c
similarity index 100%
rename from examples/stm32f1/lisa-m/fancyblink/fancyblink.c
rename to examples/stm32/f1/lisa-m/fancyblink/fancyblink.c
diff --git a/examples/stm32f1/lisa-m/fancyblink/fancyblink.ld b/examples/stm32/f1/lisa-m/fancyblink/fancyblink.ld
similarity index 100%
rename from examples/stm32f1/lisa-m/fancyblink/fancyblink.ld
rename to examples/stm32/f1/lisa-m/fancyblink/fancyblink.ld
diff --git a/examples/stm32f1/lisa-m/usb_dfu/Makefile b/examples/stm32/f1/lisa-m/usb_dfu/Makefile
similarity index 100%
rename from examples/stm32f1/lisa-m/usb_dfu/Makefile
rename to examples/stm32/f1/lisa-m/usb_dfu/Makefile
diff --git a/examples/stm32f1/lisa-m/usb_dfu/README b/examples/stm32/f1/lisa-m/usb_dfu/README
similarity index 100%
rename from examples/stm32f1/lisa-m/usb_dfu/README
rename to examples/stm32/f1/lisa-m/usb_dfu/README
diff --git a/examples/stm32f1/lisa-m/usb_dfu/usbdfu.c b/examples/stm32/f1/lisa-m/usb_dfu/usbdfu.c
similarity index 100%
rename from examples/stm32f1/lisa-m/usb_dfu/usbdfu.c
rename to examples/stm32/f1/lisa-m/usb_dfu/usbdfu.c
diff --git a/examples/stm32f1/lisa-m/usb_dfu/usbdfu.ld b/examples/stm32/f1/lisa-m/usb_dfu/usbdfu.ld
similarity index 100%
rename from examples/stm32f1/lisa-m/usb_dfu/usbdfu.ld
rename to examples/stm32/f1/lisa-m/usb_dfu/usbdfu.ld
diff --git a/examples/stm32f1/lisa-m/usb_hid/Makefile b/examples/stm32/f1/lisa-m/usb_hid/Makefile
similarity index 100%
rename from examples/stm32f1/lisa-m/usb_hid/Makefile
rename to examples/stm32/f1/lisa-m/usb_hid/Makefile
diff --git a/examples/stm32f1/lisa-m/usb_hid/README b/examples/stm32/f1/lisa-m/usb_hid/README
similarity index 100%
rename from examples/stm32f1/lisa-m/usb_hid/README
rename to examples/stm32/f1/lisa-m/usb_hid/README
diff --git a/examples/stm32f1/lisa-m/usb_hid/usbhid.c b/examples/stm32/f1/lisa-m/usb_hid/usbhid.c
similarity index 100%
rename from examples/stm32f1/lisa-m/usb_hid/usbhid.c
rename to examples/stm32/f1/lisa-m/usb_hid/usbhid.c
diff --git a/examples/stm32f1/lisa-m/usb_hid/usbhid.ld b/examples/stm32/f1/lisa-m/usb_hid/usbhid.ld
similarity index 100%
rename from examples/stm32f1/lisa-m/usb_hid/usbhid.ld
rename to examples/stm32/f1/lisa-m/usb_hid/usbhid.ld
diff --git a/examples/stm32f1/mb525/fancyblink/Makefile b/examples/stm32/f1/mb525/fancyblink/Makefile
similarity index 100%
rename from examples/stm32f1/mb525/fancyblink/Makefile
rename to examples/stm32/f1/mb525/fancyblink/Makefile
diff --git a/examples/stm32f1/mb525/fancyblink/README b/examples/stm32/f1/mb525/fancyblink/README
similarity index 100%
rename from examples/stm32f1/mb525/fancyblink/README
rename to examples/stm32/f1/mb525/fancyblink/README
diff --git a/examples/stm32f1/mb525/fancyblink/fancyblink.c b/examples/stm32/f1/mb525/fancyblink/fancyblink.c
similarity index 100%
rename from examples/stm32f1/mb525/fancyblink/fancyblink.c
rename to examples/stm32/f1/mb525/fancyblink/fancyblink.c
diff --git a/examples/stm32f1/mb525/fancyblink/fancyblink.ld b/examples/stm32/f1/mb525/fancyblink/fancyblink.ld
similarity index 100%
rename from examples/stm32f1/mb525/fancyblink/fancyblink.ld
rename to examples/stm32/f1/mb525/fancyblink/fancyblink.ld
diff --git a/examples/stm32f1/mb525/pwmleds/Makefile b/examples/stm32/f1/mb525/pwmleds/Makefile
similarity index 100%
rename from examples/stm32f1/mb525/pwmleds/Makefile
rename to examples/stm32/f1/mb525/pwmleds/Makefile
diff --git a/examples/stm32f1/mb525/pwmleds/README b/examples/stm32/f1/mb525/pwmleds/README
similarity index 100%
rename from examples/stm32f1/mb525/pwmleds/README
rename to examples/stm32/f1/mb525/pwmleds/README
diff --git a/examples/stm32f1/mb525/pwmleds/pwmleds.c b/examples/stm32/f1/mb525/pwmleds/pwmleds.c
similarity index 100%
rename from examples/stm32f1/mb525/pwmleds/pwmleds.c
rename to examples/stm32/f1/mb525/pwmleds/pwmleds.c
diff --git a/examples/stm32f1/mb525/pwmleds/pwmleds.ld b/examples/stm32/f1/mb525/pwmleds/pwmleds.ld
similarity index 100%
rename from examples/stm32f1/mb525/pwmleds/pwmleds.ld
rename to examples/stm32/f1/mb525/pwmleds/pwmleds.ld
diff --git a/examples/stm32f1/obldc/can/Makefile b/examples/stm32/f1/obldc/can/Makefile
similarity index 100%
rename from examples/stm32f1/obldc/can/Makefile
rename to examples/stm32/f1/obldc/can/Makefile
diff --git a/examples/stm32f1/obldc/can/can.c b/examples/stm32/f1/obldc/can/can.c
similarity index 100%
rename from examples/stm32f1/obldc/can/can.c
rename to examples/stm32/f1/obldc/can/can.c
diff --git a/examples/stm32f1/obldc/can/can.ld b/examples/stm32/f1/obldc/can/can.ld
similarity index 100%
rename from examples/stm32f1/obldc/can/can.ld
rename to examples/stm32/f1/obldc/can/can.ld
diff --git a/examples/stm32f1/obldc/led/Makefile b/examples/stm32/f1/obldc/led/Makefile
similarity index 100%
rename from examples/stm32f1/obldc/led/Makefile
rename to examples/stm32/f1/obldc/led/Makefile
diff --git a/examples/stm32f1/obldc/led/led.c b/examples/stm32/f1/obldc/led/led.c
similarity index 100%
rename from examples/stm32f1/obldc/led/led.c
rename to examples/stm32/f1/obldc/led/led.c
diff --git a/examples/stm32f1/obldc/led/led.ld b/examples/stm32/f1/obldc/led/led.ld
similarity index 100%
rename from examples/stm32f1/obldc/led/led.ld
rename to examples/stm32/f1/obldc/led/led.ld
diff --git a/examples/stm32f1/obldc/pwmleds/Makefile b/examples/stm32/f1/obldc/pwmleds/Makefile
similarity index 100%
rename from examples/stm32f1/obldc/pwmleds/Makefile
rename to examples/stm32/f1/obldc/pwmleds/Makefile
diff --git a/examples/stm32f1/obldc/pwmleds/pwmleds.c b/examples/stm32/f1/obldc/pwmleds/pwmleds.c
similarity index 100%
rename from examples/stm32f1/obldc/pwmleds/pwmleds.c
rename to examples/stm32/f1/obldc/pwmleds/pwmleds.c
diff --git a/examples/stm32f1/obldc/pwmleds/pwmleds.ld b/examples/stm32/f1/obldc/pwmleds/pwmleds.ld
similarity index 100%
rename from examples/stm32f1/obldc/pwmleds/pwmleds.ld
rename to examples/stm32/f1/obldc/pwmleds/pwmleds.ld
diff --git a/examples/stm32f1/obldc/systick/Makefile b/examples/stm32/f1/obldc/systick/Makefile
similarity index 100%
rename from examples/stm32f1/obldc/systick/Makefile
rename to examples/stm32/f1/obldc/systick/Makefile
diff --git a/examples/stm32f1/obldc/systick/systick.c b/examples/stm32/f1/obldc/systick/systick.c
similarity index 100%
rename from examples/stm32f1/obldc/systick/systick.c
rename to examples/stm32/f1/obldc/systick/systick.c
diff --git a/examples/stm32f1/obldc/systick/systick.ld b/examples/stm32/f1/obldc/systick/systick.ld
similarity index 100%
rename from examples/stm32f1/obldc/systick/systick.ld
rename to examples/stm32/f1/obldc/systick/systick.ld
diff --git a/examples/stm32f1/obldc/usart/Makefile b/examples/stm32/f1/obldc/usart/Makefile
similarity index 100%
rename from examples/stm32f1/obldc/usart/Makefile
rename to examples/stm32/f1/obldc/usart/Makefile
diff --git a/examples/stm32f1/obldc/usart/usart.c b/examples/stm32/f1/obldc/usart/usart.c
similarity index 100%
rename from examples/stm32f1/obldc/usart/usart.c
rename to examples/stm32/f1/obldc/usart/usart.c
diff --git a/examples/stm32f1/obldc/usart/usart.ld b/examples/stm32/f1/obldc/usart/usart.ld
similarity index 100%
rename from examples/stm32f1/obldc/usart/usart.ld
rename to examples/stm32/f1/obldc/usart/usart.ld
diff --git a/examples/stm32f1/obldc/usart_irq/Makefile b/examples/stm32/f1/obldc/usart_irq/Makefile
similarity index 100%
rename from examples/stm32f1/obldc/usart_irq/Makefile
rename to examples/stm32/f1/obldc/usart_irq/Makefile
diff --git a/examples/stm32f1/obldc/usart_irq/usart_irq.c b/examples/stm32/f1/obldc/usart_irq/usart_irq.c
similarity index 100%
rename from examples/stm32f1/obldc/usart_irq/usart_irq.c
rename to examples/stm32/f1/obldc/usart_irq/usart_irq.c
diff --git a/examples/stm32f1/obldc/usart_irq/usart_irq.ld b/examples/stm32/f1/obldc/usart_irq/usart_irq.ld
similarity index 100%
rename from examples/stm32f1/obldc/usart_irq/usart_irq.ld
rename to examples/stm32/f1/obldc/usart_irq/usart_irq.ld
diff --git a/examples/stm32f1/other/adc_temperature_sensor/Makefile b/examples/stm32/f1/other/adc_temperature_sensor/Makefile
similarity index 100%
rename from examples/stm32f1/other/adc_temperature_sensor/Makefile
rename to examples/stm32/f1/other/adc_temperature_sensor/Makefile
diff --git a/examples/stm32f1/other/adc_temperature_sensor/README b/examples/stm32/f1/other/adc_temperature_sensor/README
similarity index 100%
rename from examples/stm32f1/other/adc_temperature_sensor/README
rename to examples/stm32/f1/other/adc_temperature_sensor/README
diff --git a/examples/stm32f1/other/adc_temperature_sensor/adc.c b/examples/stm32/f1/other/adc_temperature_sensor/adc.c
similarity index 100%
rename from examples/stm32f1/other/adc_temperature_sensor/adc.c
rename to examples/stm32/f1/other/adc_temperature_sensor/adc.c
diff --git a/examples/stm32f1/other/adc_temperature_sensor/adc.ld b/examples/stm32/f1/other/adc_temperature_sensor/adc.ld
similarity index 100%
rename from examples/stm32f1/other/adc_temperature_sensor/adc.ld
rename to examples/stm32/f1/other/adc_temperature_sensor/adc.ld
diff --git a/examples/stm32f1/other/dma_mem2mem/Makefile b/examples/stm32/f1/other/dma_mem2mem/Makefile
similarity index 100%
rename from examples/stm32f1/other/dma_mem2mem/Makefile
rename to examples/stm32/f1/other/dma_mem2mem/Makefile
diff --git a/examples/stm32f1/other/dma_mem2mem/README b/examples/stm32/f1/other/dma_mem2mem/README
similarity index 100%
rename from examples/stm32f1/other/dma_mem2mem/README
rename to examples/stm32/f1/other/dma_mem2mem/README
diff --git a/examples/stm32f1/other/dma_mem2mem/dma.c b/examples/stm32/f1/other/dma_mem2mem/dma.c
similarity index 100%
rename from examples/stm32f1/other/dma_mem2mem/dma.c
rename to examples/stm32/f1/other/dma_mem2mem/dma.c
diff --git a/examples/stm32f1/other/dma_mem2mem/dma.ld b/examples/stm32/f1/other/dma_mem2mem/dma.ld
similarity index 100%
rename from examples/stm32f1/other/dma_mem2mem/dma.ld
rename to examples/stm32/f1/other/dma_mem2mem/dma.ld
diff --git a/examples/stm32f1/other/dogm128/Makefile b/examples/stm32/f1/other/dogm128/Makefile
similarity index 100%
rename from examples/stm32f1/other/dogm128/Makefile
rename to examples/stm32/f1/other/dogm128/Makefile
diff --git a/examples/stm32f1/other/dogm128/README b/examples/stm32/f1/other/dogm128/README
similarity index 100%
rename from examples/stm32f1/other/dogm128/README
rename to examples/stm32/f1/other/dogm128/README
diff --git a/examples/stm32f1/other/dogm128/dogm128.c b/examples/stm32/f1/other/dogm128/dogm128.c
similarity index 100%
rename from examples/stm32f1/other/dogm128/dogm128.c
rename to examples/stm32/f1/other/dogm128/dogm128.c
diff --git a/examples/stm32f1/other/dogm128/dogm128.h b/examples/stm32/f1/other/dogm128/dogm128.h
similarity index 100%
rename from examples/stm32f1/other/dogm128/dogm128.h
rename to examples/stm32/f1/other/dogm128/dogm128.h
diff --git a/examples/stm32f1/other/dogm128/main.c b/examples/stm32/f1/other/dogm128/main.c
similarity index 100%
rename from examples/stm32f1/other/dogm128/main.c
rename to examples/stm32/f1/other/dogm128/main.c
diff --git a/examples/stm32f1/other/dogm128/main.ld b/examples/stm32/f1/other/dogm128/main.ld
similarity index 100%
rename from examples/stm32f1/other/dogm128/main.ld
rename to examples/stm32/f1/other/dogm128/main.ld
diff --git a/examples/stm32f1/other/i2c_stts75_sensor/Makefile b/examples/stm32/f1/other/i2c_stts75_sensor/Makefile
similarity index 100%
rename from examples/stm32f1/other/i2c_stts75_sensor/Makefile
rename to examples/stm32/f1/other/i2c_stts75_sensor/Makefile
diff --git a/examples/stm32f1/other/i2c_stts75_sensor/README b/examples/stm32/f1/other/i2c_stts75_sensor/README
similarity index 100%
rename from examples/stm32f1/other/i2c_stts75_sensor/README
rename to examples/stm32/f1/other/i2c_stts75_sensor/README
diff --git a/examples/stm32f1/other/i2c_stts75_sensor/i2c_stts75_sensor.c b/examples/stm32/f1/other/i2c_stts75_sensor/i2c_stts75_sensor.c
similarity index 100%
rename from examples/stm32f1/other/i2c_stts75_sensor/i2c_stts75_sensor.c
rename to examples/stm32/f1/other/i2c_stts75_sensor/i2c_stts75_sensor.c
diff --git a/examples/stm32f1/other/i2c_stts75_sensor/i2c_stts75_sensor.ld b/examples/stm32/f1/other/i2c_stts75_sensor/i2c_stts75_sensor.ld
similarity index 100%
rename from examples/stm32f1/other/i2c_stts75_sensor/i2c_stts75_sensor.ld
rename to examples/stm32/f1/other/i2c_stts75_sensor/i2c_stts75_sensor.ld
diff --git a/examples/stm32f1/other/i2c_stts75_sensor/stts75.c b/examples/stm32/f1/other/i2c_stts75_sensor/stts75.c
similarity index 100%
rename from examples/stm32f1/other/i2c_stts75_sensor/stts75.c
rename to examples/stm32/f1/other/i2c_stts75_sensor/stts75.c
diff --git a/examples/stm32f1/other/i2c_stts75_sensor/stts75.h b/examples/stm32/f1/other/i2c_stts75_sensor/stts75.h
similarity index 100%
rename from examples/stm32f1/other/i2c_stts75_sensor/stts75.h
rename to examples/stm32/f1/other/i2c_stts75_sensor/stts75.h
diff --git a/examples/stm32f1/other/rtc/Makefile b/examples/stm32/f1/other/rtc/Makefile
similarity index 100%
rename from examples/stm32f1/other/rtc/Makefile
rename to examples/stm32/f1/other/rtc/Makefile
diff --git a/examples/stm32f1/other/rtc/README b/examples/stm32/f1/other/rtc/README
similarity index 100%
rename from examples/stm32f1/other/rtc/README
rename to examples/stm32/f1/other/rtc/README
diff --git a/examples/stm32f1/other/rtc/rtc.c b/examples/stm32/f1/other/rtc/rtc.c
similarity index 100%
rename from examples/stm32f1/other/rtc/rtc.c
rename to examples/stm32/f1/other/rtc/rtc.c
diff --git a/examples/stm32f1/other/rtc/rtc.ld b/examples/stm32/f1/other/rtc/rtc.ld
similarity index 100%
rename from examples/stm32f1/other/rtc/rtc.ld
rename to examples/stm32/f1/other/rtc/rtc.ld
diff --git a/examples/stm32f1/other/systick/Makefile b/examples/stm32/f1/other/systick/Makefile
similarity index 100%
rename from examples/stm32f1/other/systick/Makefile
rename to examples/stm32/f1/other/systick/Makefile
diff --git a/examples/stm32f1/other/systick/README b/examples/stm32/f1/other/systick/README
similarity index 100%
rename from examples/stm32f1/other/systick/README
rename to examples/stm32/f1/other/systick/README
diff --git a/examples/stm32f1/other/systick/systick.c b/examples/stm32/f1/other/systick/systick.c
similarity index 100%
rename from examples/stm32f1/other/systick/systick.c
rename to examples/stm32/f1/other/systick/systick.c
diff --git a/examples/stm32f1/other/systick/systick.ld b/examples/stm32/f1/other/systick/systick.ld
similarity index 100%
rename from examples/stm32f1/other/systick/systick.ld
rename to examples/stm32/f1/other/systick/systick.ld
diff --git a/examples/stm32f1/other/timer_interrupt/Makefile b/examples/stm32/f1/other/timer_interrupt/Makefile
similarity index 100%
rename from examples/stm32f1/other/timer_interrupt/Makefile
rename to examples/stm32/f1/other/timer_interrupt/Makefile
diff --git a/examples/stm32f1/other/timer_interrupt/README b/examples/stm32/f1/other/timer_interrupt/README
similarity index 100%
rename from examples/stm32f1/other/timer_interrupt/README
rename to examples/stm32/f1/other/timer_interrupt/README
diff --git a/examples/stm32f1/other/timer_interrupt/timer.c b/examples/stm32/f1/other/timer_interrupt/timer.c
similarity index 100%
rename from examples/stm32f1/other/timer_interrupt/timer.c
rename to examples/stm32/f1/other/timer_interrupt/timer.c
diff --git a/examples/stm32f1/other/timer_interrupt/timer.ld b/examples/stm32/f1/other/timer_interrupt/timer.ld
similarity index 100%
rename from examples/stm32f1/other/timer_interrupt/timer.ld
rename to examples/stm32/f1/other/timer_interrupt/timer.ld
diff --git a/examples/stm32f1/other/usb_cdcacm/Makefile b/examples/stm32/f1/other/usb_cdcacm/Makefile
similarity index 100%
rename from examples/stm32f1/other/usb_cdcacm/Makefile
rename to examples/stm32/f1/other/usb_cdcacm/Makefile
diff --git a/examples/stm32f1/other/usb_cdcacm/README b/examples/stm32/f1/other/usb_cdcacm/README
similarity index 100%
rename from examples/stm32f1/other/usb_cdcacm/README
rename to examples/stm32/f1/other/usb_cdcacm/README
diff --git a/examples/stm32f1/other/usb_cdcacm/cdcacm.c b/examples/stm32/f1/other/usb_cdcacm/cdcacm.c
similarity index 100%
rename from examples/stm32f1/other/usb_cdcacm/cdcacm.c
rename to examples/stm32/f1/other/usb_cdcacm/cdcacm.c
diff --git a/examples/stm32f1/other/usb_cdcacm/cdcacm.ld b/examples/stm32/f1/other/usb_cdcacm/cdcacm.ld
similarity index 100%
rename from examples/stm32f1/other/usb_cdcacm/cdcacm.ld
rename to examples/stm32/f1/other/usb_cdcacm/cdcacm.ld
diff --git a/examples/stm32f1/other/usb_dfu/Makefile b/examples/stm32/f1/other/usb_dfu/Makefile
similarity index 100%
rename from examples/stm32f1/other/usb_dfu/Makefile
rename to examples/stm32/f1/other/usb_dfu/Makefile
diff --git a/examples/stm32f1/other/usb_dfu/README b/examples/stm32/f1/other/usb_dfu/README
similarity index 100%
rename from examples/stm32f1/other/usb_dfu/README
rename to examples/stm32/f1/other/usb_dfu/README
diff --git a/examples/stm32f1/other/usb_dfu/usbdfu.c b/examples/stm32/f1/other/usb_dfu/usbdfu.c
similarity index 100%
rename from examples/stm32f1/other/usb_dfu/usbdfu.c
rename to examples/stm32/f1/other/usb_dfu/usbdfu.c
diff --git a/examples/stm32f1/other/usb_dfu/usbdfu.ld b/examples/stm32/f1/other/usb_dfu/usbdfu.ld
similarity index 100%
rename from examples/stm32f1/other/usb_dfu/usbdfu.ld
rename to examples/stm32/f1/other/usb_dfu/usbdfu.ld
diff --git a/examples/stm32f1/other/usb_hid/Makefile b/examples/stm32/f1/other/usb_hid/Makefile
similarity index 100%
rename from examples/stm32f1/other/usb_hid/Makefile
rename to examples/stm32/f1/other/usb_hid/Makefile
diff --git a/examples/stm32f1/other/usb_hid/README b/examples/stm32/f1/other/usb_hid/README
similarity index 100%
rename from examples/stm32f1/other/usb_hid/README
rename to examples/stm32/f1/other/usb_hid/README
diff --git a/examples/stm32f1/other/usb_hid/usbhid.c b/examples/stm32/f1/other/usb_hid/usbhid.c
similarity index 100%
rename from examples/stm32f1/other/usb_hid/usbhid.c
rename to examples/stm32/f1/other/usb_hid/usbhid.c
diff --git a/examples/stm32f1/other/usb_hid/usbhid.ld b/examples/stm32/f1/other/usb_hid/usbhid.ld
similarity index 100%
rename from examples/stm32f1/other/usb_hid/usbhid.ld
rename to examples/stm32/f1/other/usb_hid/usbhid.ld
diff --git a/examples/stm32f1/stm32-discovery/button/Makefile b/examples/stm32/f1/stm32-discovery/button/Makefile
similarity index 100%
rename from examples/stm32f1/stm32-discovery/button/Makefile
rename to examples/stm32/f1/stm32-discovery/button/Makefile
diff --git a/examples/stm32f1/stm32-discovery/button/README b/examples/stm32/f1/stm32-discovery/button/README
similarity index 100%
rename from examples/stm32f1/stm32-discovery/button/README
rename to examples/stm32/f1/stm32-discovery/button/README
diff --git a/examples/stm32f1/stm32-discovery/button/button.c b/examples/stm32/f1/stm32-discovery/button/button.c
similarity index 100%
rename from examples/stm32f1/stm32-discovery/button/button.c
rename to examples/stm32/f1/stm32-discovery/button/button.c
diff --git a/examples/stm32f1/stm32-discovery/button/button.ld b/examples/stm32/f1/stm32-discovery/button/button.ld
similarity index 100%
rename from examples/stm32f1/stm32-discovery/button/button.ld
rename to examples/stm32/f1/stm32-discovery/button/button.ld
diff --git a/examples/stm32f1/stm32-discovery/fancyblink/Makefile b/examples/stm32/f1/stm32-discovery/fancyblink/Makefile
similarity index 100%
rename from examples/stm32f1/stm32-discovery/fancyblink/Makefile
rename to examples/stm32/f1/stm32-discovery/fancyblink/Makefile
diff --git a/examples/stm32f1/stm32-discovery/fancyblink/README b/examples/stm32/f1/stm32-discovery/fancyblink/README
similarity index 100%
rename from examples/stm32f1/stm32-discovery/fancyblink/README
rename to examples/stm32/f1/stm32-discovery/fancyblink/README
diff --git a/examples/stm32f1/stm32-discovery/fancyblink/fancyblink.c b/examples/stm32/f1/stm32-discovery/fancyblink/fancyblink.c
similarity index 100%
rename from examples/stm32f1/stm32-discovery/fancyblink/fancyblink.c
rename to examples/stm32/f1/stm32-discovery/fancyblink/fancyblink.c
diff --git a/examples/stm32f1/stm32-discovery/fancyblink/fancyblink.ld b/examples/stm32/f1/stm32-discovery/fancyblink/fancyblink.ld
similarity index 100%
rename from examples/stm32f1/stm32-discovery/fancyblink/fancyblink.ld
rename to examples/stm32/f1/stm32-discovery/fancyblink/fancyblink.ld
diff --git a/examples/stm32f1/stm32-discovery/miniblink/Makefile b/examples/stm32/f1/stm32-discovery/miniblink/Makefile
similarity index 100%
rename from examples/stm32f1/stm32-discovery/miniblink/Makefile
rename to examples/stm32/f1/stm32-discovery/miniblink/Makefile
diff --git a/examples/stm32f1/stm32-discovery/miniblink/README b/examples/stm32/f1/stm32-discovery/miniblink/README
similarity index 100%
rename from examples/stm32f1/stm32-discovery/miniblink/README
rename to examples/stm32/f1/stm32-discovery/miniblink/README
diff --git a/examples/stm32f1/stm32-discovery/miniblink/miniblink.c b/examples/stm32/f1/stm32-discovery/miniblink/miniblink.c
similarity index 100%
rename from examples/stm32f1/stm32-discovery/miniblink/miniblink.c
rename to examples/stm32/f1/stm32-discovery/miniblink/miniblink.c
diff --git a/examples/stm32f1/stm32-discovery/miniblink/miniblink.ld b/examples/stm32/f1/stm32-discovery/miniblink/miniblink.ld
similarity index 100%
rename from examples/stm32f1/stm32-discovery/miniblink/miniblink.ld
rename to examples/stm32/f1/stm32-discovery/miniblink/miniblink.ld
diff --git a/examples/stm32f1/stm32-discovery/rtc/Makefile b/examples/stm32/f1/stm32-discovery/rtc/Makefile
similarity index 100%
rename from examples/stm32f1/stm32-discovery/rtc/Makefile
rename to examples/stm32/f1/stm32-discovery/rtc/Makefile
diff --git a/examples/stm32f1/stm32-discovery/rtc/README b/examples/stm32/f1/stm32-discovery/rtc/README
similarity index 100%
rename from examples/stm32f1/stm32-discovery/rtc/README
rename to examples/stm32/f1/stm32-discovery/rtc/README
diff --git a/examples/stm32f1/stm32-discovery/rtc/rtc.c b/examples/stm32/f1/stm32-discovery/rtc/rtc.c
similarity index 100%
rename from examples/stm32f1/stm32-discovery/rtc/rtc.c
rename to examples/stm32/f1/stm32-discovery/rtc/rtc.c
diff --git a/examples/stm32f1/stm32-discovery/rtc/rtc.ld b/examples/stm32/f1/stm32-discovery/rtc/rtc.ld
similarity index 100%
rename from examples/stm32f1/stm32-discovery/rtc/rtc.ld
rename to examples/stm32/f1/stm32-discovery/rtc/rtc.ld
diff --git a/examples/stm32f1/stm32-discovery/usart/Makefile b/examples/stm32/f1/stm32-discovery/usart/Makefile
similarity index 100%
rename from examples/stm32f1/stm32-discovery/usart/Makefile
rename to examples/stm32/f1/stm32-discovery/usart/Makefile
diff --git a/examples/stm32f1/stm32-discovery/usart/README b/examples/stm32/f1/stm32-discovery/usart/README
similarity index 100%
rename from examples/stm32f1/stm32-discovery/usart/README
rename to examples/stm32/f1/stm32-discovery/usart/README
diff --git a/examples/stm32f1/stm32-discovery/usart/usart.c b/examples/stm32/f1/stm32-discovery/usart/usart.c
similarity index 100%
rename from examples/stm32f1/stm32-discovery/usart/usart.c
rename to examples/stm32/f1/stm32-discovery/usart/usart.c
diff --git a/examples/stm32f1/stm32-discovery/usart/usart.ld b/examples/stm32/f1/stm32-discovery/usart/usart.ld
similarity index 100%
rename from examples/stm32f1/stm32-discovery/usart/usart.ld
rename to examples/stm32/f1/stm32-discovery/usart/usart.ld
diff --git a/examples/stm32f1/stm32-h103/button/Makefile b/examples/stm32/f1/stm32-h103/button/Makefile
similarity index 100%
rename from examples/stm32f1/stm32-h103/button/Makefile
rename to examples/stm32/f1/stm32-h103/button/Makefile
diff --git a/examples/stm32f1/stm32-h103/button/button.c b/examples/stm32/f1/stm32-h103/button/button.c
similarity index 100%
rename from examples/stm32f1/stm32-h103/button/button.c
rename to examples/stm32/f1/stm32-h103/button/button.c
diff --git a/examples/stm32f1/stm32-h103/button/button.ld b/examples/stm32/f1/stm32-h103/button/button.ld
similarity index 100%
rename from examples/stm32f1/stm32-h103/button/button.ld
rename to examples/stm32/f1/stm32-h103/button/button.ld
diff --git a/examples/stm32f1/stm32-h103/exti_both/Makefile b/examples/stm32/f1/stm32-h103/exti_both/Makefile
similarity index 100%
rename from examples/stm32f1/stm32-h103/exti_both/Makefile
rename to examples/stm32/f1/stm32-h103/exti_both/Makefile
diff --git a/examples/stm32f1/stm32-h103/exti_both/exti_both.c b/examples/stm32/f1/stm32-h103/exti_both/exti_both.c
similarity index 100%
rename from examples/stm32f1/stm32-h103/exti_both/exti_both.c
rename to examples/stm32/f1/stm32-h103/exti_both/exti_both.c
diff --git a/examples/stm32f1/stm32-h103/exti_both/exti_both.ld b/examples/stm32/f1/stm32-h103/exti_both/exti_both.ld
similarity index 100%
rename from examples/stm32f1/stm32-h103/exti_both/exti_both.ld
rename to examples/stm32/f1/stm32-h103/exti_both/exti_both.ld
diff --git a/examples/stm32f1/stm32-h103/exti_rising_falling/Makefile b/examples/stm32/f1/stm32-h103/exti_rising_falling/Makefile
similarity index 100%
rename from examples/stm32f1/stm32-h103/exti_rising_falling/Makefile
rename to examples/stm32/f1/stm32-h103/exti_rising_falling/Makefile
diff --git a/examples/stm32f1/stm32-h103/exti_rising_falling/exti_rising_falling.c b/examples/stm32/f1/stm32-h103/exti_rising_falling/exti_rising_falling.c
similarity index 100%
rename from examples/stm32f1/stm32-h103/exti_rising_falling/exti_rising_falling.c
rename to examples/stm32/f1/stm32-h103/exti_rising_falling/exti_rising_falling.c
diff --git a/examples/stm32f1/stm32-h103/exti_rising_falling/exti_rising_falling.ld b/examples/stm32/f1/stm32-h103/exti_rising_falling/exti_rising_falling.ld
similarity index 100%
rename from examples/stm32f1/stm32-h103/exti_rising_falling/exti_rising_falling.ld
rename to examples/stm32/f1/stm32-h103/exti_rising_falling/exti_rising_falling.ld
diff --git a/examples/stm32f1/stm32-h103/fancyblink/Makefile b/examples/stm32/f1/stm32-h103/fancyblink/Makefile
similarity index 100%
rename from examples/stm32f1/stm32-h103/fancyblink/Makefile
rename to examples/stm32/f1/stm32-h103/fancyblink/Makefile
diff --git a/examples/stm32f1/stm32-h103/fancyblink/README b/examples/stm32/f1/stm32-h103/fancyblink/README
similarity index 100%
rename from examples/stm32f1/stm32-h103/fancyblink/README
rename to examples/stm32/f1/stm32-h103/fancyblink/README
diff --git a/examples/stm32f1/stm32-h103/fancyblink/fancyblink.c b/examples/stm32/f1/stm32-h103/fancyblink/fancyblink.c
similarity index 100%
rename from examples/stm32f1/stm32-h103/fancyblink/fancyblink.c
rename to examples/stm32/f1/stm32-h103/fancyblink/fancyblink.c
diff --git a/examples/stm32f1/stm32-h103/fancyblink/fancyblink.ld b/examples/stm32/f1/stm32-h103/fancyblink/fancyblink.ld
similarity index 100%
rename from examples/stm32f1/stm32-h103/fancyblink/fancyblink.ld
rename to examples/stm32/f1/stm32-h103/fancyblink/fancyblink.ld
diff --git a/examples/stm32f1/stm32-h103/led_stripe/Makefile b/examples/stm32/f1/stm32-h103/led_stripe/Makefile
similarity index 100%
rename from examples/stm32f1/stm32-h103/led_stripe/Makefile
rename to examples/stm32/f1/stm32-h103/led_stripe/Makefile
diff --git a/examples/stm32f1/stm32-h103/led_stripe/led_stripe.c b/examples/stm32/f1/stm32-h103/led_stripe/led_stripe.c
similarity index 100%
rename from examples/stm32f1/stm32-h103/led_stripe/led_stripe.c
rename to examples/stm32/f1/stm32-h103/led_stripe/led_stripe.c
diff --git a/examples/stm32f1/stm32-h103/led_stripe/led_stripe.ld b/examples/stm32/f1/stm32-h103/led_stripe/led_stripe.ld
similarity index 100%
rename from examples/stm32f1/stm32-h103/led_stripe/led_stripe.ld
rename to examples/stm32/f1/stm32-h103/led_stripe/led_stripe.ld
diff --git a/examples/stm32f1/stm32-h103/miniblink/Makefile b/examples/stm32/f1/stm32-h103/miniblink/Makefile
similarity index 100%
rename from examples/stm32f1/stm32-h103/miniblink/Makefile
rename to examples/stm32/f1/stm32-h103/miniblink/Makefile
diff --git a/examples/stm32f1/stm32-h103/miniblink/README b/examples/stm32/f1/stm32-h103/miniblink/README
similarity index 100%
rename from examples/stm32f1/stm32-h103/miniblink/README
rename to examples/stm32/f1/stm32-h103/miniblink/README
diff --git a/examples/stm32f1/stm32-h103/miniblink/miniblink.c b/examples/stm32/f1/stm32-h103/miniblink/miniblink.c
similarity index 100%
rename from examples/stm32f1/stm32-h103/miniblink/miniblink.c
rename to examples/stm32/f1/stm32-h103/miniblink/miniblink.c
diff --git a/examples/stm32f1/stm32-h103/miniblink/miniblink.ld b/examples/stm32/f1/stm32-h103/miniblink/miniblink.ld
similarity index 100%
rename from examples/stm32f1/stm32-h103/miniblink/miniblink.ld
rename to examples/stm32/f1/stm32-h103/miniblink/miniblink.ld
diff --git a/examples/stm32f1/stm32-h103/pwm_6step/Makefile b/examples/stm32/f1/stm32-h103/pwm_6step/Makefile
similarity index 100%
rename from examples/stm32f1/stm32-h103/pwm_6step/Makefile
rename to examples/stm32/f1/stm32-h103/pwm_6step/Makefile
diff --git a/examples/stm32f1/stm32-h103/pwm_6step/pwm_6step.c b/examples/stm32/f1/stm32-h103/pwm_6step/pwm_6step.c
similarity index 100%
rename from examples/stm32f1/stm32-h103/pwm_6step/pwm_6step.c
rename to examples/stm32/f1/stm32-h103/pwm_6step/pwm_6step.c
diff --git a/examples/stm32f1/stm32-h103/pwm_6step/pwm_6step.ld b/examples/stm32/f1/stm32-h103/pwm_6step/pwm_6step.ld
similarity index 100%
rename from examples/stm32f1/stm32-h103/pwm_6step/pwm_6step.ld
rename to examples/stm32/f1/stm32-h103/pwm_6step/pwm_6step.ld
diff --git a/examples/stm32f1/stm32-h103/spi/Makefile b/examples/stm32/f1/stm32-h103/spi/Makefile
similarity index 100%
rename from examples/stm32f1/stm32-h103/spi/Makefile
rename to examples/stm32/f1/stm32-h103/spi/Makefile
diff --git a/examples/stm32f1/stm32-h103/spi/README b/examples/stm32/f1/stm32-h103/spi/README
similarity index 100%
rename from examples/stm32f1/stm32-h103/spi/README
rename to examples/stm32/f1/stm32-h103/spi/README
diff --git a/examples/stm32f1/stm32-h103/spi/spi.c b/examples/stm32/f1/stm32-h103/spi/spi.c
similarity index 100%
rename from examples/stm32f1/stm32-h103/spi/spi.c
rename to examples/stm32/f1/stm32-h103/spi/spi.c
diff --git a/examples/stm32f1/stm32-h103/spi/spi.ld b/examples/stm32/f1/stm32-h103/spi/spi.ld
similarity index 100%
rename from examples/stm32f1/stm32-h103/spi/spi.ld
rename to examples/stm32/f1/stm32-h103/spi/spi.ld
diff --git a/examples/stm32f1/stm32-h103/timer/Makefile b/examples/stm32/f1/stm32-h103/timer/Makefile
similarity index 100%
rename from examples/stm32f1/stm32-h103/timer/Makefile
rename to examples/stm32/f1/stm32-h103/timer/Makefile
diff --git a/examples/stm32f1/stm32-h103/timer/timer.c b/examples/stm32/f1/stm32-h103/timer/timer.c
similarity index 100%
rename from examples/stm32f1/stm32-h103/timer/timer.c
rename to examples/stm32/f1/stm32-h103/timer/timer.c
diff --git a/examples/stm32f1/stm32-h103/timer/timer.ld b/examples/stm32/f1/stm32-h103/timer/timer.ld
similarity index 100%
rename from examples/stm32f1/stm32-h103/timer/timer.ld
rename to examples/stm32/f1/stm32-h103/timer/timer.ld
diff --git a/examples/stm32f1/stm32-h103/traceswo/Makefile b/examples/stm32/f1/stm32-h103/traceswo/Makefile
similarity index 100%
rename from examples/stm32f1/stm32-h103/traceswo/Makefile
rename to examples/stm32/f1/stm32-h103/traceswo/Makefile
diff --git a/examples/stm32f1/stm32-h103/traceswo/README b/examples/stm32/f1/stm32-h103/traceswo/README
similarity index 100%
rename from examples/stm32f1/stm32-h103/traceswo/README
rename to examples/stm32/f1/stm32-h103/traceswo/README
diff --git a/examples/stm32f1/stm32-h103/traceswo/traceswo.c b/examples/stm32/f1/stm32-h103/traceswo/traceswo.c
similarity index 100%
rename from examples/stm32f1/stm32-h103/traceswo/traceswo.c
rename to examples/stm32/f1/stm32-h103/traceswo/traceswo.c
diff --git a/examples/stm32f1/stm32-h103/traceswo/traceswo.ld b/examples/stm32/f1/stm32-h103/traceswo/traceswo.ld
similarity index 100%
rename from examples/stm32f1/stm32-h103/traceswo/traceswo.ld
rename to examples/stm32/f1/stm32-h103/traceswo/traceswo.ld
diff --git a/examples/stm32f1/stm32-h103/usart/Makefile b/examples/stm32/f1/stm32-h103/usart/Makefile
similarity index 100%
rename from examples/stm32f1/stm32-h103/usart/Makefile
rename to examples/stm32/f1/stm32-h103/usart/Makefile
diff --git a/examples/stm32f1/stm32-h103/usart/README b/examples/stm32/f1/stm32-h103/usart/README
similarity index 100%
rename from examples/stm32f1/stm32-h103/usart/README
rename to examples/stm32/f1/stm32-h103/usart/README
diff --git a/examples/stm32f1/stm32-h103/usart/usart.c b/examples/stm32/f1/stm32-h103/usart/usart.c
similarity index 100%
rename from examples/stm32f1/stm32-h103/usart/usart.c
rename to examples/stm32/f1/stm32-h103/usart/usart.c
diff --git a/examples/stm32f1/stm32-h103/usart/usart.ld b/examples/stm32/f1/stm32-h103/usart/usart.ld
similarity index 100%
rename from examples/stm32f1/stm32-h103/usart/usart.ld
rename to examples/stm32/f1/stm32-h103/usart/usart.ld
diff --git a/examples/stm32f1/stm32-h103/usart_irq/Makefile b/examples/stm32/f1/stm32-h103/usart_irq/Makefile
similarity index 100%
rename from examples/stm32f1/stm32-h103/usart_irq/Makefile
rename to examples/stm32/f1/stm32-h103/usart_irq/Makefile
diff --git a/examples/stm32f1/stm32-h103/usart_irq/usart_irq.c b/examples/stm32/f1/stm32-h103/usart_irq/usart_irq.c
similarity index 100%
rename from examples/stm32f1/stm32-h103/usart_irq/usart_irq.c
rename to examples/stm32/f1/stm32-h103/usart_irq/usart_irq.c
diff --git a/examples/stm32f1/stm32-h103/usart_irq/usart_irq.ld b/examples/stm32/f1/stm32-h103/usart_irq/usart_irq.ld
similarity index 100%
rename from examples/stm32f1/stm32-h103/usart_irq/usart_irq.ld
rename to examples/stm32/f1/stm32-h103/usart_irq/usart_irq.ld
diff --git a/examples/stm32f1/stm32-h103/usart_irq_printf/Makefile b/examples/stm32/f1/stm32-h103/usart_irq_printf/Makefile
similarity index 100%
rename from examples/stm32f1/stm32-h103/usart_irq_printf/Makefile
rename to examples/stm32/f1/stm32-h103/usart_irq_printf/Makefile
diff --git a/examples/stm32f1/stm32-h103/usart_irq_printf/usart_irq_printf.c b/examples/stm32/f1/stm32-h103/usart_irq_printf/usart_irq_printf.c
similarity index 100%
rename from examples/stm32f1/stm32-h103/usart_irq_printf/usart_irq_printf.c
rename to examples/stm32/f1/stm32-h103/usart_irq_printf/usart_irq_printf.c
diff --git a/examples/stm32f1/stm32-h103/usart_irq_printf/usart_irq_printf.ld b/examples/stm32/f1/stm32-h103/usart_irq_printf/usart_irq_printf.ld
similarity index 100%
rename from examples/stm32f1/stm32-h103/usart_irq_printf/usart_irq_printf.ld
rename to examples/stm32/f1/stm32-h103/usart_irq_printf/usart_irq_printf.ld
diff --git a/examples/stm32f1/stm32-h103/usart_printf/Makefile b/examples/stm32/f1/stm32-h103/usart_printf/Makefile
similarity index 100%
rename from examples/stm32f1/stm32-h103/usart_printf/Makefile
rename to examples/stm32/f1/stm32-h103/usart_printf/Makefile
diff --git a/examples/stm32f1/stm32-h103/usart_printf/usart_printf.c b/examples/stm32/f1/stm32-h103/usart_printf/usart_printf.c
similarity index 100%
rename from examples/stm32f1/stm32-h103/usart_printf/usart_printf.c
rename to examples/stm32/f1/stm32-h103/usart_printf/usart_printf.c
diff --git a/examples/stm32f1/stm32-h103/usart_printf/usart_printf.ld b/examples/stm32/f1/stm32-h103/usart_printf/usart_printf.ld
similarity index 100%
rename from examples/stm32f1/stm32-h103/usart_printf/usart_printf.ld
rename to examples/stm32/f1/stm32-h103/usart_printf/usart_printf.ld
diff --git a/examples/stm32f1/stm32-h103/usb_cdcacm/Makefile b/examples/stm32/f1/stm32-h103/usb_cdcacm/Makefile
similarity index 100%
rename from examples/stm32f1/stm32-h103/usb_cdcacm/Makefile
rename to examples/stm32/f1/stm32-h103/usb_cdcacm/Makefile
diff --git a/examples/stm32f1/stm32-h103/usb_cdcacm/README b/examples/stm32/f1/stm32-h103/usb_cdcacm/README
similarity index 100%
rename from examples/stm32f1/stm32-h103/usb_cdcacm/README
rename to examples/stm32/f1/stm32-h103/usb_cdcacm/README
diff --git a/examples/stm32f1/stm32-h103/usb_cdcacm/cdcacm.c b/examples/stm32/f1/stm32-h103/usb_cdcacm/cdcacm.c
similarity index 100%
rename from examples/stm32f1/stm32-h103/usb_cdcacm/cdcacm.c
rename to examples/stm32/f1/stm32-h103/usb_cdcacm/cdcacm.c
diff --git a/examples/stm32f1/stm32-h103/usb_cdcacm/cdcacm.ld b/examples/stm32/f1/stm32-h103/usb_cdcacm/cdcacm.ld
similarity index 100%
rename from examples/stm32f1/stm32-h103/usb_cdcacm/cdcacm.ld
rename to examples/stm32/f1/stm32-h103/usb_cdcacm/cdcacm.ld
diff --git a/examples/stm32f1/stm32-h103/usb_dfu/Makefile b/examples/stm32/f1/stm32-h103/usb_dfu/Makefile
similarity index 100%
rename from examples/stm32f1/stm32-h103/usb_dfu/Makefile
rename to examples/stm32/f1/stm32-h103/usb_dfu/Makefile
diff --git a/examples/stm32f1/stm32-h103/usb_dfu/README b/examples/stm32/f1/stm32-h103/usb_dfu/README
similarity index 100%
rename from examples/stm32f1/stm32-h103/usb_dfu/README
rename to examples/stm32/f1/stm32-h103/usb_dfu/README
diff --git a/examples/stm32f1/stm32-h103/usb_dfu/usbdfu.c b/examples/stm32/f1/stm32-h103/usb_dfu/usbdfu.c
similarity index 100%
rename from examples/stm32f1/stm32-h103/usb_dfu/usbdfu.c
rename to examples/stm32/f1/stm32-h103/usb_dfu/usbdfu.c
diff --git a/examples/stm32f1/stm32-h103/usb_dfu/usbdfu.ld b/examples/stm32/f1/stm32-h103/usb_dfu/usbdfu.ld
similarity index 100%
rename from examples/stm32f1/stm32-h103/usb_dfu/usbdfu.ld
rename to examples/stm32/f1/stm32-h103/usb_dfu/usbdfu.ld
diff --git a/examples/stm32f1/stm32-h103/usb_hid/Makefile b/examples/stm32/f1/stm32-h103/usb_hid/Makefile
similarity index 100%
rename from examples/stm32f1/stm32-h103/usb_hid/Makefile
rename to examples/stm32/f1/stm32-h103/usb_hid/Makefile
diff --git a/examples/stm32f1/stm32-h103/usb_hid/README b/examples/stm32/f1/stm32-h103/usb_hid/README
similarity index 100%
rename from examples/stm32f1/stm32-h103/usb_hid/README
rename to examples/stm32/f1/stm32-h103/usb_hid/README
diff --git a/examples/stm32f1/stm32-h103/usb_hid/usbhid.c b/examples/stm32/f1/stm32-h103/usb_hid/usbhid.c
similarity index 100%
rename from examples/stm32f1/stm32-h103/usb_hid/usbhid.c
rename to examples/stm32/f1/stm32-h103/usb_hid/usbhid.c
diff --git a/examples/stm32f1/stm32-h103/usb_hid/usbhid.ld b/examples/stm32/f1/stm32-h103/usb_hid/usbhid.ld
similarity index 100%
rename from examples/stm32f1/stm32-h103/usb_hid/usbhid.ld
rename to examples/stm32/f1/stm32-h103/usb_hid/usbhid.ld
diff --git a/examples/stm32f1/stm32-h103/usb_iap/Makefile b/examples/stm32/f1/stm32-h103/usb_iap/Makefile
similarity index 100%
rename from examples/stm32f1/stm32-h103/usb_iap/Makefile
rename to examples/stm32/f1/stm32-h103/usb_iap/Makefile
diff --git a/examples/stm32f1/stm32-h103/usb_iap/README b/examples/stm32/f1/stm32-h103/usb_iap/README
similarity index 100%
rename from examples/stm32f1/stm32-h103/usb_iap/README
rename to examples/stm32/f1/stm32-h103/usb_iap/README
diff --git a/examples/stm32f1/stm32-h103/usb_iap/usbiap.c b/examples/stm32/f1/stm32-h103/usb_iap/usbiap.c
similarity index 100%
rename from examples/stm32f1/stm32-h103/usb_iap/usbiap.c
rename to examples/stm32/f1/stm32-h103/usb_iap/usbiap.c
diff --git a/examples/stm32f1/stm32-h103/usb_iap/usbiap.ld b/examples/stm32/f1/stm32-h103/usb_iap/usbiap.ld
similarity index 100%
rename from examples/stm32f1/stm32-h103/usb_iap/usbiap.ld
rename to examples/stm32/f1/stm32-h103/usb_iap/usbiap.ld
diff --git a/examples/stm32f1/stm32-h107/fancyblink/Makefile b/examples/stm32/f1/stm32-h107/fancyblink/Makefile
similarity index 100%
rename from examples/stm32f1/stm32-h107/fancyblink/Makefile
rename to examples/stm32/f1/stm32-h107/fancyblink/Makefile
diff --git a/examples/stm32f1/stm32-h107/fancyblink/README b/examples/stm32/f1/stm32-h107/fancyblink/README
similarity index 100%
rename from examples/stm32f1/stm32-h107/fancyblink/README
rename to examples/stm32/f1/stm32-h107/fancyblink/README
diff --git a/examples/stm32f1/stm32-h107/fancyblink/fancyblink.c b/examples/stm32/f1/stm32-h107/fancyblink/fancyblink.c
similarity index 100%
rename from examples/stm32f1/stm32-h107/fancyblink/fancyblink.c
rename to examples/stm32/f1/stm32-h107/fancyblink/fancyblink.c
diff --git a/examples/stm32f1/stm32-h107/fancyblink/fancyblink.ld b/examples/stm32/f1/stm32-h107/fancyblink/fancyblink.ld
similarity index 100%
rename from examples/stm32f1/stm32-h107/fancyblink/fancyblink.ld
rename to examples/stm32/f1/stm32-h107/fancyblink/fancyblink.ld
diff --git a/examples/stm32f1/stm32-h107/usb_simple/Makefile b/examples/stm32/f1/stm32-h107/usb_simple/Makefile
similarity index 100%
rename from examples/stm32f1/stm32-h107/usb_simple/Makefile
rename to examples/stm32/f1/stm32-h107/usb_simple/Makefile
diff --git a/examples/stm32f1/stm32-h107/usb_simple/README b/examples/stm32/f1/stm32-h107/usb_simple/README
similarity index 100%
rename from examples/stm32f1/stm32-h107/usb_simple/README
rename to examples/stm32/f1/stm32-h107/usb_simple/README
diff --git a/examples/stm32f1/stm32-h107/usb_simple/usb_simple.c b/examples/stm32/f1/stm32-h107/usb_simple/usb_simple.c
similarity index 100%
rename from examples/stm32f1/stm32-h107/usb_simple/usb_simple.c
rename to examples/stm32/f1/stm32-h107/usb_simple/usb_simple.c
diff --git a/examples/stm32f1/stm32-h107/usb_simple/usb_simple.ld b/examples/stm32/f1/stm32-h107/usb_simple/usb_simple.ld
similarity index 100%
rename from examples/stm32f1/stm32-h107/usb_simple/usb_simple.ld
rename to examples/stm32/f1/stm32-h107/usb_simple/usb_simple.ld
diff --git a/examples/stm32f2/Makefile.include b/examples/stm32/f2/Makefile.include
similarity index 96%
rename from examples/stm32f2/Makefile.include
rename to examples/stm32/f2/Makefile.include
index 3f5bf9d0..aa9a1596 100644
--- a/examples/stm32f2/Makefile.include
+++ b/examples/stm32/f2/Makefile.include
@@ -28,12 +28,12 @@ OBJDUMP		= $(PREFIX)-objdump
 GDB		= $(PREFIX)-gdb
 # Uncomment this line if you want to use the installed (not local) library.
 #TOOLCHAIN_DIR := $(shell dirname `which $(CC)`)/../$(PREFIX)
-TOOLCHAIN_DIR   = ../../../..
+TOOLCHAIN_DIR   = ../../../../..
 CFLAGS		+= -Os -g -Wall -Wextra -I$(TOOLCHAIN_DIR)/include \
 		   -fno-common -mcpu=cortex-m3 -mthumb -msoft-float -MD -DSTM32F2
 LDSCRIPT	= $(BINARY).ld
 LDFLAGS		+= -lc -lnosys -L$(TOOLCHAIN_DIR)/lib \
-			 -L$(TOOLCHAIN_DIR)/lib/stm32f2 \
+			 -L$(TOOLCHAIN_DIR)/lib/stm32/f2 \
 		   -T$(LDSCRIPT) -nostartfiles -Wl,--gc-sections \
 		   -mthumb -march=armv7 -mfix-cortex-m3-ldrd -msoft-float
 OBJS		+= $(BINARY).o
@@ -81,7 +81,7 @@ flash: $(BINARY).flash
 	@#printf "  OBJDUMP $(*).list\n"
 	$(Q)$(OBJDUMP) -S $(*).elf > $(*).list
 
-%.elf: $(OBJS) $(LDSCRIPT) $(TOOLCHAIN_DIR)/lib/stm32f2/libopencm3_stm32f2.a
+%.elf: $(OBJS) $(LDSCRIPT) $(TOOLCHAIN_DIR)/lib/stm32/f2/libopencm3_stm32f2.a
 	@#printf "  LD      $(subst $(shell pwd)/,,$(@))\n"
 	$(Q)$(LD) -o $(*).elf $(OBJS) -lopencm3_stm32f2 $(LDFLAGS)
 
diff --git a/examples/stm32f2/jobygps/jobygps.cfg b/examples/stm32/f2/jobygps/jobygps.cfg
similarity index 100%
rename from examples/stm32f2/jobygps/jobygps.cfg
rename to examples/stm32/f2/jobygps/jobygps.cfg
diff --git a/examples/stm32f2/jobygps/miniblink/Makefile b/examples/stm32/f2/jobygps/miniblink/Makefile
similarity index 100%
rename from examples/stm32f2/jobygps/miniblink/Makefile
rename to examples/stm32/f2/jobygps/miniblink/Makefile
diff --git a/examples/stm32f2/jobygps/miniblink/README b/examples/stm32/f2/jobygps/miniblink/README
similarity index 100%
rename from examples/stm32f2/jobygps/miniblink/README
rename to examples/stm32/f2/jobygps/miniblink/README
diff --git a/examples/stm32f2/jobygps/miniblink/miniblink.c b/examples/stm32/f2/jobygps/miniblink/miniblink.c
similarity index 100%
rename from examples/stm32f2/jobygps/miniblink/miniblink.c
rename to examples/stm32/f2/jobygps/miniblink/miniblink.c
diff --git a/examples/stm32f2/jobygps/miniblink/miniblink.ld b/examples/stm32/f2/jobygps/miniblink/miniblink.ld
similarity index 100%
rename from examples/stm32f2/jobygps/miniblink/miniblink.ld
rename to examples/stm32/f2/jobygps/miniblink/miniblink.ld
diff --git a/examples/stm32f2/jobygps/spi_test/Makefile b/examples/stm32/f2/jobygps/spi_test/Makefile
similarity index 100%
rename from examples/stm32f2/jobygps/spi_test/Makefile
rename to examples/stm32/f2/jobygps/spi_test/Makefile
diff --git a/examples/stm32f2/jobygps/spi_test/spi_test.c b/examples/stm32/f2/jobygps/spi_test/spi_test.c
similarity index 97%
rename from examples/stm32f2/jobygps/spi_test/spi_test.c
rename to examples/stm32/f2/jobygps/spi_test/spi_test.c
index b45789ca..f1ce7196 100644
--- a/examples/stm32f2/jobygps/spi_test/spi_test.c
+++ b/examples/stm32/f2/jobygps/spi_test/spi_test.c
@@ -31,7 +31,7 @@ void clock_setup(void)
 {
   RCC_APB1ENR |= RCC_APB1ENR_SPI2EN;
   RCC_APB2ENR |= RCC_APB2ENR_USART1EN;
-	RCC_AHB1ENR |= RCC_AHB1ENR_GPIOCEN | RCC_AHB1ENR_GPIOAEN | RCC_AHB1ENR_GPIOBEN;
+	RCC_AHB1ENR |= RCC_AHB1ENR_IOPCEN | RCC_AHB1ENR_IOPAEN | RCC_AHB1ENR_IOPBEN;
 	
 }
 
diff --git a/examples/stm32f2/jobygps/spi_test/spi_test.ld b/examples/stm32/f2/jobygps/spi_test/spi_test.ld
similarity index 100%
rename from examples/stm32f2/jobygps/spi_test/spi_test.ld
rename to examples/stm32/f2/jobygps/spi_test/spi_test.ld
diff --git a/examples/stm32f2/jobygps/usart_printf/Makefile b/examples/stm32/f2/jobygps/usart_printf/Makefile
similarity index 100%
rename from examples/stm32f2/jobygps/usart_printf/Makefile
rename to examples/stm32/f2/jobygps/usart_printf/Makefile
diff --git a/examples/stm32f2/jobygps/usart_printf/usart_printf.c b/examples/stm32/f2/jobygps/usart_printf/usart_printf.c
similarity index 97%
rename from examples/stm32f2/jobygps/usart_printf/usart_printf.c
rename to examples/stm32/f2/jobygps/usart_printf/usart_printf.c
index f5a4cf58..d9c8dbbc 100644
--- a/examples/stm32f2/jobygps/usart_printf/usart_printf.c
+++ b/examples/stm32/f2/jobygps/usart_printf/usart_printf.c
@@ -38,7 +38,7 @@ void clock_setup(void)
 //				RCC_APB2ENR_AFIOEN |
 //				RCC_APB2ENR_USART1EN);
   RCC_APB2ENR |= RCC_APB2ENR_USART1EN;
-	RCC_AHB1ENR |= RCC_AHB1ENR_GPIOCEN | RCC_AHB1ENR_GPIOAEN;
+	RCC_AHB1ENR |= RCC_AHB1ENR_IOPCEN | RCC_AHB1ENR_IOPAEN;
 }
 
 void usart_setup(void)
diff --git a/examples/stm32f2/jobygps/usart_printf/usart_printf.ld b/examples/stm32/f2/jobygps/usart_printf/usart_printf.ld
similarity index 100%
rename from examples/stm32f2/jobygps/usart_printf/usart_printf.ld
rename to examples/stm32/f2/jobygps/usart_printf/usart_printf.ld