diff --git a/demos/bsp/boards/board.h b/demos/bsp/boards/board.h
index 13f2e436..80cb653b 100644
--- a/demos/bsp/boards/board.h
+++ b/demos/bsp/boards/board.h
@@ -73,13 +73,13 @@
 #if BOARD == 0
   #error BOARD is not defined or supported yet
 #elif BOARD == BOARD_NGX4330
-  #include "board_ngx4330.h"
+  #include "ngx/board_ngx4330.h"
 #elif BOARD == BOARD_LPCXPRESSO1347
   #include "board_lpcxpresso1347.h"
 #elif BOARD == BOARD_AT86RF2XX
   #include "board_at86rf2xx.h"
 #elif BOARD == BOARD_EA4357
-  #include "embedded_artists\board_ea4357.h"
+  #include "embedded_artists/board_ea4357.h"
 #else
   #error BOARD is not defined or supported yet
 #endif
diff --git a/demos/bsp/boards/board_ngx4330.c b/demos/bsp/boards/ngx/board_ngx4330.c
similarity index 99%
rename from demos/bsp/boards/board_ngx4330.c
rename to demos/bsp/boards/ngx/board_ngx4330.c
index d42159d3..b9dffabb 100644
--- a/demos/bsp/boards/board_ngx4330.c
+++ b/demos/bsp/boards/ngx/board_ngx4330.c
@@ -35,7 +35,7 @@
  * This file is part of the tiny usb stack.
  */
 
-#include "board.h"
+#include "../board.h"
 
 #if BOARD == BOARD_NGX4330
 
diff --git a/demos/bsp/boards/board_ngx4330.h b/demos/bsp/boards/ngx/board_ngx4330.h
similarity index 100%
rename from demos/bsp/boards/board_ngx4330.h
rename to demos/bsp/boards/ngx/board_ngx4330.h
diff --git a/demos/host/host_os_none/.cproject b/demos/host/host_os_none/.cproject
index afcf871a..485840d9 100644
--- a/demos/host/host_os_none/.cproject
+++ b/demos/host/host_os_none/.cproject
@@ -85,7 +85,7 @@
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
-						<entry excluding="bsp/boards/embedded_artists|bsp/boards/embedded_artists/oem_base_board/uda1380.c|bsp/boards/embedded_artists/oem_base_board/norflash.c|bsp/boards/embedded_artists/oem_base_board/memreg.c|bsp/boards/embedded_artists/oem_base_board/lm75a.c|bsp/boards/embedded_artists/oem_base_board/joystick.c|bsp/boards/embedded_artists/oem_base_board/base_eeprom.c|bsp/boards/embedded_artists/oem_base_board/acc.c|bsp/lpc11uxx|NGX|bsp/lpc13uxx" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name=""/>
+						<entry excluding="bsp/boards/embedded_artists/oem_base_board/acc.c|bsp/boards/embedded_artists/oem_base_board/base_eeprom.c|ngx|bsp/boards/embedded_artists/oem_base_board/joystick.c|bsp/boards/embedded_artists|bsp/lpc11uxx|bsp/boards/embedded_artists/oem_base_board/lm75a.c|bsp/boards/embedded_artists/oem_base_board/uda1380.c|bsp/lpc13uxx|bsp/boards/embedded_artists/oem_base_board/memreg.c|bsp/boards/embedded_artists/oem_base_board/norflash.c" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name=""/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
@@ -1196,7 +1196,7 @@
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
-						<entry excluding="bsp/boards/embedded_artists/oem_base_board/uda1380.c|bsp/boards/embedded_artists/oem_base_board/norflash.c|bsp/boards/embedded_artists/oem_base_board/memreg.c|bsp/boards/embedded_artists/oem_base_board/lm75a.c|bsp/boards/embedded_artists/oem_base_board/joystick.c|bsp/boards/embedded_artists/oem_base_board/base_eeprom.c|bsp/boards/embedded_artists/oem_base_board/acc.c|bsp/lpc11uxx|NGX|bsp/lpc13uxx" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name=""/>
+						<entry excluding="bsp/boards/embedded_artists/oem_base_board/acc.c|bsp/boards/embedded_artists/oem_base_board/base_eeprom.c|ngx|bsp/boards/embedded_artists/oem_base_board/joystick.c|bsp/lpc11uxx|bsp/boards/embedded_artists/oem_base_board/lm75a.c|bsp/boards/embedded_artists/oem_base_board/uda1380.c|bsp/lpc13uxx|bsp/boards/embedded_artists/oem_base_board/memreg.c|bsp/boards/embedded_artists/oem_base_board/norflash.c" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name=""/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>