diff --git a/demos/bsp/boards/ansi_escape.h b/boards/ansi_escape.h
similarity index 100%
rename from demos/bsp/boards/ansi_escape.h
rename to boards/ansi_escape.h
diff --git a/demos/bsp/boards/board.c b/boards/board.c
similarity index 100%
rename from demos/bsp/boards/board.c
rename to boards/board.c
diff --git a/demos/bsp/boards/board.h b/boards/board.h
similarity index 100%
rename from demos/bsp/boards/board.h
rename to boards/board.h
diff --git a/demos/bsp/boards/embedded_artists/ea4357/board_ea4357.c b/boards/embedded_artists/ea4357/board_ea4357.c
similarity index 100%
rename from demos/bsp/boards/embedded_artists/ea4357/board_ea4357.c
rename to boards/embedded_artists/ea4357/board_ea4357.c
diff --git a/demos/bsp/boards/embedded_artists/ea4357/board_ea4357.h b/boards/embedded_artists/ea4357/board_ea4357.h
similarity index 100%
rename from demos/bsp/boards/embedded_artists/ea4357/board_ea4357.h
rename to boards/embedded_artists/ea4357/board_ea4357.h
diff --git a/demos/bsp/boards/embedded_artists/ea4357/emac.c b/boards/embedded_artists/ea4357/emac.c
similarity index 100%
rename from demos/bsp/boards/embedded_artists/ea4357/emac.c
rename to boards/embedded_artists/ea4357/emac.c
diff --git a/demos/bsp/boards/embedded_artists/ea4357/emac.h b/boards/embedded_artists/ea4357/emac.h
similarity index 100%
rename from demos/bsp/boards/embedded_artists/ea4357/emac.h
rename to boards/embedded_artists/ea4357/emac.h
diff --git a/demos/bsp/boards/embedded_artists/ea4357/nand.c b/boards/embedded_artists/ea4357/nand.c
similarity index 100%
rename from demos/bsp/boards/embedded_artists/ea4357/nand.c
rename to boards/embedded_artists/ea4357/nand.c
diff --git a/demos/bsp/boards/embedded_artists/ea4357/nand.h b/boards/embedded_artists/ea4357/nand.h
similarity index 100%
rename from demos/bsp/boards/embedded_artists/ea4357/nand.h
rename to boards/embedded_artists/ea4357/nand.h
diff --git a/demos/bsp/boards/embedded_artists/ea4357/sdram.c b/boards/embedded_artists/ea4357/sdram.c
similarity index 100%
rename from demos/bsp/boards/embedded_artists/ea4357/sdram.c
rename to boards/embedded_artists/ea4357/sdram.c
diff --git a/demos/bsp/boards/embedded_artists/ea4357/sdram.h b/boards/embedded_artists/ea4357/sdram.h
similarity index 100%
rename from demos/bsp/boards/embedded_artists/ea4357/sdram.h
rename to boards/embedded_artists/ea4357/sdram.h
diff --git a/demos/bsp/boards/embedded_artists/oem_base_board/acc.c b/boards/embedded_artists/oem_base_board/acc.c
similarity index 100%
rename from demos/bsp/boards/embedded_artists/oem_base_board/acc.c
rename to boards/embedded_artists/oem_base_board/acc.c
diff --git a/demos/bsp/boards/embedded_artists/oem_base_board/acc.h b/boards/embedded_artists/oem_base_board/acc.h
similarity index 100%
rename from demos/bsp/boards/embedded_artists/oem_base_board/acc.h
rename to boards/embedded_artists/oem_base_board/acc.h
diff --git a/demos/bsp/boards/embedded_artists/oem_base_board/base_eeprom.c b/boards/embedded_artists/oem_base_board/base_eeprom.c
similarity index 100%
rename from demos/bsp/boards/embedded_artists/oem_base_board/base_eeprom.c
rename to boards/embedded_artists/oem_base_board/base_eeprom.c
diff --git a/demos/bsp/boards/embedded_artists/oem_base_board/base_eeprom.h b/boards/embedded_artists/oem_base_board/base_eeprom.h
similarity index 100%
rename from demos/bsp/boards/embedded_artists/oem_base_board/base_eeprom.h
rename to boards/embedded_artists/oem_base_board/base_eeprom.h
diff --git a/demos/bsp/boards/embedded_artists/oem_base_board/joystick.c b/boards/embedded_artists/oem_base_board/joystick.c
similarity index 100%
rename from demos/bsp/boards/embedded_artists/oem_base_board/joystick.c
rename to boards/embedded_artists/oem_base_board/joystick.c
diff --git a/demos/bsp/boards/embedded_artists/oem_base_board/joystick.h b/boards/embedded_artists/oem_base_board/joystick.h
similarity index 100%
rename from demos/bsp/boards/embedded_artists/oem_base_board/joystick.h
rename to boards/embedded_artists/oem_base_board/joystick.h
diff --git a/demos/bsp/boards/embedded_artists/oem_base_board/lm75a.c b/boards/embedded_artists/oem_base_board/lm75a.c
similarity index 100%
rename from demos/bsp/boards/embedded_artists/oem_base_board/lm75a.c
rename to boards/embedded_artists/oem_base_board/lm75a.c
diff --git a/demos/bsp/boards/embedded_artists/oem_base_board/lm75a.h b/boards/embedded_artists/oem_base_board/lm75a.h
similarity index 100%
rename from demos/bsp/boards/embedded_artists/oem_base_board/lm75a.h
rename to boards/embedded_artists/oem_base_board/lm75a.h
diff --git a/demos/bsp/boards/embedded_artists/oem_base_board/memreg.c b/boards/embedded_artists/oem_base_board/memreg.c
similarity index 100%
rename from demos/bsp/boards/embedded_artists/oem_base_board/memreg.c
rename to boards/embedded_artists/oem_base_board/memreg.c
diff --git a/demos/bsp/boards/embedded_artists/oem_base_board/memreg.h b/boards/embedded_artists/oem_base_board/memreg.h
similarity index 100%
rename from demos/bsp/boards/embedded_artists/oem_base_board/memreg.h
rename to boards/embedded_artists/oem_base_board/memreg.h
diff --git a/demos/bsp/boards/embedded_artists/oem_base_board/norflash.c b/boards/embedded_artists/oem_base_board/norflash.c
similarity index 100%
rename from demos/bsp/boards/embedded_artists/oem_base_board/norflash.c
rename to boards/embedded_artists/oem_base_board/norflash.c
diff --git a/demos/bsp/boards/embedded_artists/oem_base_board/norflash.h b/boards/embedded_artists/oem_base_board/norflash.h
similarity index 100%
rename from demos/bsp/boards/embedded_artists/oem_base_board/norflash.h
rename to boards/embedded_artists/oem_base_board/norflash.h
diff --git a/demos/bsp/boards/embedded_artists/oem_base_board/pca9532.c b/boards/embedded_artists/oem_base_board/pca9532.c
similarity index 100%
rename from demos/bsp/boards/embedded_artists/oem_base_board/pca9532.c
rename to boards/embedded_artists/oem_base_board/pca9532.c
diff --git a/demos/bsp/boards/embedded_artists/oem_base_board/pca9532.h b/boards/embedded_artists/oem_base_board/pca9532.h
similarity index 100%
rename from demos/bsp/boards/embedded_artists/oem_base_board/pca9532.h
rename to boards/embedded_artists/oem_base_board/pca9532.h
diff --git a/demos/bsp/boards/embedded_artists/oem_base_board/uda1380.c b/boards/embedded_artists/oem_base_board/uda1380.c
similarity index 100%
rename from demos/bsp/boards/embedded_artists/oem_base_board/uda1380.c
rename to boards/embedded_artists/oem_base_board/uda1380.c
diff --git a/demos/bsp/boards/embedded_artists/oem_base_board/uda1380.h b/boards/embedded_artists/oem_base_board/uda1380.h
similarity index 100%
rename from demos/bsp/boards/embedded_artists/oem_base_board/uda1380.h
rename to boards/embedded_artists/oem_base_board/uda1380.h
diff --git a/demos/bsp/boards/hitex/board_hitex4350.c b/boards/hitex/board_hitex4350.c
similarity index 100%
rename from demos/bsp/boards/hitex/board_hitex4350.c
rename to boards/hitex/board_hitex4350.c
diff --git a/demos/bsp/boards/hitex/board_hitex4350.h b/boards/hitex/board_hitex4350.h
similarity index 100%
rename from demos/bsp/boards/hitex/board_hitex4350.h
rename to boards/hitex/board_hitex4350.h
diff --git a/demos/bsp/boards/keil/board_mcb4300.c b/boards/keil/board_mcb4300.c
similarity index 100%
rename from demos/bsp/boards/keil/board_mcb4300.c
rename to boards/keil/board_mcb4300.c
diff --git a/demos/bsp/boards/keil/board_mcb4300.h b/boards/keil/board_mcb4300.h
similarity index 100%
rename from demos/bsp/boards/keil/board_mcb4300.h
rename to boards/keil/board_mcb4300.h
diff --git a/demos/bsp/boards/lpcxpresso/board_lpclink2.c b/boards/lpcxpresso/board_lpclink2.c
similarity index 100%
rename from demos/bsp/boards/lpcxpresso/board_lpclink2.c
rename to boards/lpcxpresso/board_lpclink2.c
diff --git a/demos/bsp/boards/lpcxpresso/board_lpclink2.h b/boards/lpcxpresso/board_lpclink2.h
similarity index 100%
rename from demos/bsp/boards/lpcxpresso/board_lpclink2.h
rename to boards/lpcxpresso/board_lpclink2.h
diff --git a/demos/bsp/boards/lpcxpresso/board_lpcxpresso1347.c b/boards/lpcxpresso/board_lpcxpresso1347.c
similarity index 100%
rename from demos/bsp/boards/lpcxpresso/board_lpcxpresso1347.c
rename to boards/lpcxpresso/board_lpcxpresso1347.c
diff --git a/demos/bsp/boards/lpcxpresso/board_lpcxpresso1347.h b/boards/lpcxpresso/board_lpcxpresso1347.h
similarity index 100%
rename from demos/bsp/boards/lpcxpresso/board_lpcxpresso1347.h
rename to boards/lpcxpresso/board_lpcxpresso1347.h
diff --git a/demos/bsp/boards/lpcxpresso/board_lpcxpresso1769.c b/boards/lpcxpresso/board_lpcxpresso1769.c
similarity index 100%
rename from demos/bsp/boards/lpcxpresso/board_lpcxpresso1769.c
rename to boards/lpcxpresso/board_lpcxpresso1769.c
diff --git a/demos/bsp/boards/lpcxpresso/board_lpcxpresso1769.h b/boards/lpcxpresso/board_lpcxpresso1769.h
similarity index 100%
rename from demos/bsp/boards/lpcxpresso/board_lpcxpresso1769.h
rename to boards/lpcxpresso/board_lpcxpresso1769.h
diff --git a/demos/bsp/boards/microbuilder/board_lpc4357usb.c b/boards/microbuilder/board_lpc4357usb.c
similarity index 100%
rename from demos/bsp/boards/microbuilder/board_lpc4357usb.c
rename to boards/microbuilder/board_lpc4357usb.c
diff --git a/demos/bsp/boards/microbuilder/board_lpc4357usb.h b/boards/microbuilder/board_lpc4357usb.h
similarity index 100%
rename from demos/bsp/boards/microbuilder/board_lpc4357usb.h
rename to boards/microbuilder/board_lpc4357usb.h
diff --git a/demos/bsp/boards/microbuilder/board_lpc4357usb_etminit.ini b/boards/microbuilder/board_lpc4357usb_etminit.ini
similarity index 100%
rename from demos/bsp/boards/microbuilder/board_lpc4357usb_etminit.ini
rename to boards/microbuilder/board_lpc4357usb_etminit.ini
diff --git a/demos/bsp/boards/microbuilder/board_rf1ghznode.c b/boards/microbuilder/board_rf1ghznode.c
similarity index 100%
rename from demos/bsp/boards/microbuilder/board_rf1ghznode.c
rename to boards/microbuilder/board_rf1ghznode.c
diff --git a/demos/bsp/boards/microbuilder/board_rf1ghznode.h b/boards/microbuilder/board_rf1ghznode.h
similarity index 100%
rename from demos/bsp/boards/microbuilder/board_rf1ghznode.h
rename to boards/microbuilder/board_rf1ghznode.h
diff --git a/demos/bsp/boards/ngx/board_ngx4330.c b/boards/ngx/board_ngx4330.c
similarity index 100%
rename from demos/bsp/boards/ngx/board_ngx4330.c
rename to boards/ngx/board_ngx4330.c
diff --git a/demos/bsp/boards/ngx/board_ngx4330.h b/boards/ngx/board_ngx4330.h
similarity index 100%
rename from demos/bsp/boards/ngx/board_ngx4330.h
rename to boards/ngx/board_ngx4330.h
diff --git a/demos/bsp/boards/printf_retarget.c b/boards/printf_retarget.c
similarity index 100%
rename from demos/bsp/boards/printf_retarget.c
rename to boards/printf_retarget.c