diff --git a/bsp/stm32/stm32l475-atk-pandora/applications/SConscript b/bsp/stm32/stm32l475-atk-pandora/applications/SConscript
index bfa9a40db9543d61948850db993ec6a6117e96fb..2d88e1d24801729bbaf0f8d5d8e5dde76cf010f7 100644
--- a/bsp/stm32/stm32l475-atk-pandora/applications/SConscript
+++ b/bsp/stm32/stm32l475-atk-pandora/applications/SConscript
@@ -8,9 +8,6 @@ src = ['main.c']
 if GetDepend(['PKG_USING_NRF24L01']):
     src += ['nrf24l01_init.c']
 
-if GetDepend(['RT_USING_ARDUINO']):
-    src += ['arduino_main.cpp']
-
 CPPPATH = [cwd]
 
 group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH)
diff --git a/bsp/stm32/stm32l475-atk-pandora/board/ports/arduino/SConscript b/bsp/stm32/stm32l475-atk-pandora/applications/arduino/SConscript
similarity index 64%
rename from bsp/stm32/stm32l475-atk-pandora/board/ports/arduino/SConscript
rename to bsp/stm32/stm32l475-atk-pandora/applications/arduino/SConscript
index 2c5b27d9d241e6013c2d8d28fbdd0b3689252de7..b3d32f3717a68bf8212edf05b2812182070869c5 100644
--- a/bsp/stm32/stm32l475-atk-pandora/board/ports/arduino/SConscript
+++ b/bsp/stm32/stm32l475-atk-pandora/applications/arduino/SConscript
@@ -6,4 +6,7 @@ inc = [cwd]
 
 group = DefineGroup('Arduino', src, depend = ['RT_USING_ARDUINO'], CPPPATH = inc)
 
+src = ['arduino_main.cpp']
+group = DefineGroup('Applications', src, depend = ['RT_USING_ARDUINO'])
+
 Return('group')
diff --git a/bsp/stm32/stm32l475-atk-pandora/applications/arduino_main.cpp b/bsp/stm32/stm32l475-atk-pandora/applications/arduino/arduino_main.cpp
similarity index 100%
rename from bsp/stm32/stm32l475-atk-pandora/applications/arduino_main.cpp
rename to bsp/stm32/stm32l475-atk-pandora/applications/arduino/arduino_main.cpp
diff --git a/bsp/stm32/stm32l475-atk-pandora/board/ports/arduino/arduino_pinout.c b/bsp/stm32/stm32l475-atk-pandora/applications/arduino/arduino_pinout.c
similarity index 100%
rename from bsp/stm32/stm32l475-atk-pandora/board/ports/arduino/arduino_pinout.c
rename to bsp/stm32/stm32l475-atk-pandora/applications/arduino/arduino_pinout.c
diff --git a/bsp/stm32/stm32l475-atk-pandora/board/ports/arduino/arduino_pinout.h b/bsp/stm32/stm32l475-atk-pandora/applications/arduino/arduino_pinout.h
similarity index 100%
rename from bsp/stm32/stm32l475-atk-pandora/board/ports/arduino/arduino_pinout.h
rename to bsp/stm32/stm32l475-atk-pandora/applications/arduino/arduino_pinout.h