diff --git a/demos/bsp/boards/board_at86rf2xx.c b/demos/bsp/boards/board_at86rf2xx.c
index 1fb0dace..f0db2cdf 100644
--- a/demos/bsp/boards/board_at86rf2xx.c
+++ b/demos/bsp/boards/board_at86rf2xx.c
@@ -40,7 +40,7 @@
 #if BOARD == BOARD_AT86RF2XX
 
 #include "LPC11Uxx.h"
-#include "gpio.h"
+#include "lpc11uxx/gpio.h"
 
 #define CFG_LED_PORT                  (1)
 #define CFG_LED_PIN                   (31)
diff --git a/demos/bsp/boards/board_lpcxpresso1347.c b/demos/bsp/boards/board_lpcxpresso1347.c
index 3d1e8430..cd1f014a 100644
--- a/demos/bsp/boards/board_lpcxpresso1347.c
+++ b/demos/bsp/boards/board_lpcxpresso1347.c
@@ -40,8 +40,8 @@
 #if BOARD == BOARD_LPCXPRESSO1347
 
 #include "LPC13Uxx.h"
-#include "lpc13uxx/inc/gpio.h"
-#include "lpc13uxx/inc/uart.h"
+#include "lpc13uxx/gpio.h"
+#include "lpc13uxx/uart.h"
 
 #define CFG_LED_PORT                  (0)
 #define CFG_LED_PIN                   (7)
diff --git a/demos/bsp/lpc11uxx/src/gpio.c b/demos/bsp/lpc11uxx/gpio.c
similarity index 100%
rename from demos/bsp/lpc11uxx/src/gpio.c
rename to demos/bsp/lpc11uxx/gpio.c
diff --git a/demos/bsp/lpc11uxx/inc/gpio.h b/demos/bsp/lpc11uxx/gpio.h
similarity index 100%
rename from demos/bsp/lpc11uxx/inc/gpio.h
rename to demos/bsp/lpc11uxx/gpio.h
diff --git a/demos/bsp/lpc13uxx/src/Serial.c b/demos/bsp/lpc13uxx/Serial.c
similarity index 100%
rename from demos/bsp/lpc13uxx/src/Serial.c
rename to demos/bsp/lpc13uxx/Serial.c
diff --git a/demos/bsp/lpc13uxx/src/clkconfig.c b/demos/bsp/lpc13uxx/clkconfig.c
similarity index 100%
rename from demos/bsp/lpc13uxx/src/clkconfig.c
rename to demos/bsp/lpc13uxx/clkconfig.c
diff --git a/demos/bsp/lpc13uxx/inc/clkconfig.h b/demos/bsp/lpc13uxx/clkconfig.h
similarity index 100%
rename from demos/bsp/lpc13uxx/inc/clkconfig.h
rename to demos/bsp/lpc13uxx/clkconfig.h
diff --git a/demos/bsp/lpc13uxx/src/gpio.c b/demos/bsp/lpc13uxx/gpio.c
similarity index 100%
rename from demos/bsp/lpc13uxx/src/gpio.c
rename to demos/bsp/lpc13uxx/gpio.c
diff --git a/demos/bsp/lpc13uxx/inc/gpio.h b/demos/bsp/lpc13uxx/gpio.h
similarity index 100%
rename from demos/bsp/lpc13uxx/inc/gpio.h
rename to demos/bsp/lpc13uxx/gpio.h
diff --git a/demos/bsp/lpc13uxx/src/nmi.c b/demos/bsp/lpc13uxx/nmi.c
similarity index 100%
rename from demos/bsp/lpc13uxx/src/nmi.c
rename to demos/bsp/lpc13uxx/nmi.c
diff --git a/demos/bsp/lpc13uxx/inc/nmi.h b/demos/bsp/lpc13uxx/nmi.h
similarity index 100%
rename from demos/bsp/lpc13uxx/inc/nmi.h
rename to demos/bsp/lpc13uxx/nmi.h
diff --git a/demos/bsp/lpc13uxx/inc/power_api.h b/demos/bsp/lpc13uxx/power_api.h
similarity index 100%
rename from demos/bsp/lpc13uxx/inc/power_api.h
rename to demos/bsp/lpc13uxx/power_api.h
diff --git a/demos/bsp/lpc13uxx/src/timer16.c b/demos/bsp/lpc13uxx/timer16.c
similarity index 100%
rename from demos/bsp/lpc13uxx/src/timer16.c
rename to demos/bsp/lpc13uxx/timer16.c
diff --git a/demos/bsp/lpc13uxx/inc/timer16.h b/demos/bsp/lpc13uxx/timer16.h
similarity index 100%
rename from demos/bsp/lpc13uxx/inc/timer16.h
rename to demos/bsp/lpc13uxx/timer16.h
diff --git a/demos/bsp/lpc13uxx/src/timer32.c b/demos/bsp/lpc13uxx/timer32.c
similarity index 100%
rename from demos/bsp/lpc13uxx/src/timer32.c
rename to demos/bsp/lpc13uxx/timer32.c
diff --git a/demos/bsp/lpc13uxx/inc/timer32.h b/demos/bsp/lpc13uxx/timer32.h
similarity index 100%
rename from demos/bsp/lpc13uxx/inc/timer32.h
rename to demos/bsp/lpc13uxx/timer32.h
diff --git a/demos/bsp/lpc13uxx/inc/type.h b/demos/bsp/lpc13uxx/type.h
similarity index 100%
rename from demos/bsp/lpc13uxx/inc/type.h
rename to demos/bsp/lpc13uxx/type.h
diff --git a/demos/bsp/lpc13uxx/src/uart.c b/demos/bsp/lpc13uxx/uart.c
similarity index 100%
rename from demos/bsp/lpc13uxx/src/uart.c
rename to demos/bsp/lpc13uxx/uart.c
diff --git a/demos/bsp/lpc13uxx/inc/uart.h b/demos/bsp/lpc13uxx/uart.h
similarity index 100%
rename from demos/bsp/lpc13uxx/inc/uart.h
rename to demos/bsp/lpc13uxx/uart.h
diff --git a/demos/bsp/lpc13uxx/inc/usart.h b/demos/bsp/lpc13uxx/usart.h
similarity index 100%
rename from demos/bsp/lpc13uxx/inc/usart.h
rename to demos/bsp/lpc13uxx/usart.h