diff --git a/bsp/qemu-vexpress-a9/applications/SConscript b/bsp/qemu-vexpress-a9/applications/SConscript
index c583d3016e..83bada9f5d 100644
--- a/bsp/qemu-vexpress-a9/applications/SConscript
+++ b/bsp/qemu-vexpress-a9/applications/SConscript
@@ -1,3 +1,4 @@
+import os
 from building import *
 
 cwd     = GetCurrentDir()
@@ -6,4 +7,9 @@ CPPPATH = [cwd]
 
 group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH)
 
+list = os.listdir(cwd)
+for item in list:
+    if os.path.isfile(os.path.join(cwd, item, 'SConscript')):
+        group = group + SConscript(os.path.join(item, 'SConscript'))
+
 Return('group')
diff --git a/bsp/qemu-vexpress-a9/drivers/lvgl/SConscript b/bsp/qemu-vexpress-a9/applications/lvgl/SConscript
similarity index 100%
rename from bsp/qemu-vexpress-a9/drivers/lvgl/SConscript
rename to bsp/qemu-vexpress-a9/applications/lvgl/SConscript
diff --git a/bsp/qemu-vexpress-a9/drivers/lvgl/lv_conf.h b/bsp/qemu-vexpress-a9/applications/lvgl/lv_conf.h
similarity index 100%
rename from bsp/qemu-vexpress-a9/drivers/lvgl/lv_conf.h
rename to bsp/qemu-vexpress-a9/applications/lvgl/lv_conf.h
diff --git a/bsp/qemu-vexpress-a9/drivers/lvgl/lv_demo.c b/bsp/qemu-vexpress-a9/applications/lvgl/lv_demo.c
similarity index 100%
rename from bsp/qemu-vexpress-a9/drivers/lvgl/lv_demo.c
rename to bsp/qemu-vexpress-a9/applications/lvgl/lv_demo.c
diff --git a/bsp/qemu-vexpress-a9/drivers/lvgl/lv_port_disp.c b/bsp/qemu-vexpress-a9/applications/lvgl/lv_port_disp.c
similarity index 100%
rename from bsp/qemu-vexpress-a9/drivers/lvgl/lv_port_disp.c
rename to bsp/qemu-vexpress-a9/applications/lvgl/lv_port_disp.c
diff --git a/bsp/qemu-vexpress-a9/drivers/lvgl/lv_port_disp.h b/bsp/qemu-vexpress-a9/applications/lvgl/lv_port_disp.h
similarity index 100%
rename from bsp/qemu-vexpress-a9/drivers/lvgl/lv_port_disp.h
rename to bsp/qemu-vexpress-a9/applications/lvgl/lv_port_disp.h
diff --git a/bsp/qemu-vexpress-a9/drivers/lvgl/lv_port_indev.c b/bsp/qemu-vexpress-a9/applications/lvgl/lv_port_indev.c
similarity index 100%
rename from bsp/qemu-vexpress-a9/drivers/lvgl/lv_port_indev.c
rename to bsp/qemu-vexpress-a9/applications/lvgl/lv_port_indev.c
diff --git a/bsp/qemu-vexpress-a9/drivers/lvgl/lv_port_indev.h b/bsp/qemu-vexpress-a9/applications/lvgl/lv_port_indev.h
similarity index 100%
rename from bsp/qemu-vexpress-a9/drivers/lvgl/lv_port_indev.h
rename to bsp/qemu-vexpress-a9/applications/lvgl/lv_port_indev.h
diff --git a/bsp/simulator/applications/SConscript b/bsp/simulator/applications/SConscript
index f13d9e42ca..7bff98687b 100644
--- a/bsp/simulator/applications/SConscript
+++ b/bsp/simulator/applications/SConscript
@@ -1,10 +1,15 @@
+import os
 from building import *
 
 cwd = GetCurrentDir()
 src	= Glob('*.c')
-
-CPPPATH = [cwd, str(Dir('#'))]
+CPPPATH = [cwd]
 
 group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH)
 
+list = os.listdir(cwd)
+for item in list:
+    if os.path.isfile(os.path.join(cwd, item, 'SConscript')):
+        group = group + SConscript(os.path.join(item, 'SConscript'))
+
 Return('group')
diff --git a/bsp/simulator/drivers/lvgl/SConscript b/bsp/simulator/applications/lvgl/SConscript
similarity index 100%
rename from bsp/simulator/drivers/lvgl/SConscript
rename to bsp/simulator/applications/lvgl/SConscript
diff --git a/bsp/simulator/drivers/lvgl/lv_conf.h b/bsp/simulator/applications/lvgl/lv_conf.h
similarity index 100%
rename from bsp/simulator/drivers/lvgl/lv_conf.h
rename to bsp/simulator/applications/lvgl/lv_conf.h
diff --git a/bsp/simulator/drivers/lvgl/lv_demo.c b/bsp/simulator/applications/lvgl/lv_demo.c
similarity index 100%
rename from bsp/simulator/drivers/lvgl/lv_demo.c
rename to bsp/simulator/applications/lvgl/lv_demo.c
diff --git a/bsp/simulator/drivers/lvgl/lv_port_disp.c b/bsp/simulator/applications/lvgl/lv_port_disp.c
similarity index 100%
rename from bsp/simulator/drivers/lvgl/lv_port_disp.c
rename to bsp/simulator/applications/lvgl/lv_port_disp.c
diff --git a/bsp/simulator/drivers/lvgl/lv_port_disp.h b/bsp/simulator/applications/lvgl/lv_port_disp.h
similarity index 100%
rename from bsp/simulator/drivers/lvgl/lv_port_disp.h
rename to bsp/simulator/applications/lvgl/lv_port_disp.h
diff --git a/bsp/simulator/drivers/lvgl/lv_port_indev.c b/bsp/simulator/applications/lvgl/lv_port_indev.c
similarity index 100%
rename from bsp/simulator/drivers/lvgl/lv_port_indev.c
rename to bsp/simulator/applications/lvgl/lv_port_indev.c
diff --git a/bsp/simulator/drivers/lvgl/lv_port_indev.h b/bsp/simulator/applications/lvgl/lv_port_indev.h
similarity index 100%
rename from bsp/simulator/drivers/lvgl/lv_port_indev.h
rename to bsp/simulator/applications/lvgl/lv_port_indev.h
diff --git a/bsp/simulator/drivers/lvgl/win32drv.c b/bsp/simulator/applications/lvgl/win32drv.c
similarity index 100%
rename from bsp/simulator/drivers/lvgl/win32drv.c
rename to bsp/simulator/applications/lvgl/win32drv.c
diff --git a/bsp/simulator/drivers/lvgl/win32drv.h b/bsp/simulator/applications/lvgl/win32drv.h
similarity index 100%
rename from bsp/simulator/drivers/lvgl/win32drv.h
rename to bsp/simulator/applications/lvgl/win32drv.h
diff --git a/bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/SConscript b/bsp/stm32/stm32l475-atk-pandora/applications/lvgl/SConscript
similarity index 100%
rename from bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/SConscript
rename to bsp/stm32/stm32l475-atk-pandora/applications/lvgl/SConscript
diff --git a/bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/demo/SConscript b/bsp/stm32/stm32l475-atk-pandora/applications/lvgl/demo/SConscript
similarity index 100%
rename from bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/demo/SConscript
rename to bsp/stm32/stm32l475-atk-pandora/applications/lvgl/demo/SConscript
diff --git a/bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/demo/lv_demo_calendar.c b/bsp/stm32/stm32l475-atk-pandora/applications/lvgl/demo/lv_demo_calendar.c
similarity index 100%
rename from bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/demo/lv_demo_calendar.c
rename to bsp/stm32/stm32l475-atk-pandora/applications/lvgl/demo/lv_demo_calendar.c
diff --git a/bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/demo/lv_demo_calendar.h b/bsp/stm32/stm32l475-atk-pandora/applications/lvgl/demo/lv_demo_calendar.h
similarity index 100%
rename from bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/demo/lv_demo_calendar.h
rename to bsp/stm32/stm32l475-atk-pandora/applications/lvgl/demo/lv_demo_calendar.h
diff --git a/bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/lv_conf.h b/bsp/stm32/stm32l475-atk-pandora/applications/lvgl/lv_conf.h
similarity index 100%
rename from bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/lv_conf.h
rename to bsp/stm32/stm32l475-atk-pandora/applications/lvgl/lv_conf.h
diff --git a/bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/lv_demo.c b/bsp/stm32/stm32l475-atk-pandora/applications/lvgl/lv_demo.c
similarity index 100%
rename from bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/lv_demo.c
rename to bsp/stm32/stm32l475-atk-pandora/applications/lvgl/lv_demo.c
diff --git a/bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/lv_port_disp.c b/bsp/stm32/stm32l475-atk-pandora/applications/lvgl/lv_port_disp.c
similarity index 100%
rename from bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/lv_port_disp.c
rename to bsp/stm32/stm32l475-atk-pandora/applications/lvgl/lv_port_disp.c
diff --git a/bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/lv_port_disp.h b/bsp/stm32/stm32l475-atk-pandora/applications/lvgl/lv_port_disp.h
similarity index 100%
rename from bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/lv_port_disp.h
rename to bsp/stm32/stm32l475-atk-pandora/applications/lvgl/lv_port_disp.h
diff --git a/bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/lv_port_indev.c b/bsp/stm32/stm32l475-atk-pandora/applications/lvgl/lv_port_indev.c
similarity index 100%
rename from bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/lv_port_indev.c
rename to bsp/stm32/stm32l475-atk-pandora/applications/lvgl/lv_port_indev.c
diff --git a/bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/lv_port_indev.h b/bsp/stm32/stm32l475-atk-pandora/applications/lvgl/lv_port_indev.h
similarity index 100%
rename from bsp/stm32/stm32l475-atk-pandora/board/ports/lvgl/lv_port_indev.h
rename to bsp/stm32/stm32l475-atk-pandora/applications/lvgl/lv_port_indev.h