diff --git a/port/stm32-f4discovery-cc256x-2/Makefile b/port/stm32-f4discovery-cc256x-2/Makefile
index 3ed6edd38..c1d6edf9c 100644
--- a/port/stm32-f4discovery-cc256x-2/Makefile
+++ b/port/stm32-f4discovery-cc256x-2/Makefile
@@ -50,7 +50,7 @@ VPATH += ${BTSTACK_ROOT}/src/classic
 VPATH += Drivers/STM32F4xx_HAL_DRIVER/Src
 VPATH += Src
 VPATH += port
-VPATH += port/bsp
+VPATH += bsp
 
 ######################################
 # source
@@ -253,9 +253,9 @@ C_INCLUDES += -I${BTSTACK_ROOT}/3rd-party/segger-rtt
 C_INCLUDES += -I${BTSTACK_ROOT}/platform/embedded
 C_INCLUDES += -I${BTSTACK_ROOT}/chipset/cc256x
 C_INCLUDES += -I Drivers/STM32F4xx_HAL_Driver/Inc
+C_INCLUDES += -I bsp
 C_INCLUDES += -I pdm
 C_INCLUDES += -I port
-C_INCLUDES += -I port/bsp
 C_INCLUDES += -I src
 
 # compile gcc flags
diff --git a/port/stm32-f4discovery-cc256x-2/port/bsp/audio.c b/port/stm32-f4discovery-cc256x-2/bsp/audio.c
similarity index 100%
rename from port/stm32-f4discovery-cc256x-2/port/bsp/audio.c
rename to port/stm32-f4discovery-cc256x-2/bsp/audio.c
diff --git a/port/stm32-f4discovery-cc256x-2/port/bsp/audio.h b/port/stm32-f4discovery-cc256x-2/bsp/audio.h
similarity index 100%
rename from port/stm32-f4discovery-cc256x-2/port/bsp/audio.h
rename to port/stm32-f4discovery-cc256x-2/bsp/audio.h
diff --git a/port/stm32-f4discovery-cc256x-2/port/bsp/cs43l22.c b/port/stm32-f4discovery-cc256x-2/bsp/cs43l22.c
similarity index 100%
rename from port/stm32-f4discovery-cc256x-2/port/bsp/cs43l22.c
rename to port/stm32-f4discovery-cc256x-2/bsp/cs43l22.c
diff --git a/port/stm32-f4discovery-cc256x-2/port/bsp/cs43l22.h b/port/stm32-f4discovery-cc256x-2/bsp/cs43l22.h
similarity index 100%
rename from port/stm32-f4discovery-cc256x-2/port/bsp/cs43l22.h
rename to port/stm32-f4discovery-cc256x-2/bsp/cs43l22.h
diff --git a/port/stm32-f4discovery-cc256x-2/port/bsp/stm32f4_discovery.c b/port/stm32-f4discovery-cc256x-2/bsp/stm32f4_discovery.c
similarity index 100%
rename from port/stm32-f4discovery-cc256x-2/port/bsp/stm32f4_discovery.c
rename to port/stm32-f4discovery-cc256x-2/bsp/stm32f4_discovery.c
diff --git a/port/stm32-f4discovery-cc256x-2/port/bsp/stm32f4_discovery.h b/port/stm32-f4discovery-cc256x-2/bsp/stm32f4_discovery.h
similarity index 100%
rename from port/stm32-f4discovery-cc256x-2/port/bsp/stm32f4_discovery.h
rename to port/stm32-f4discovery-cc256x-2/bsp/stm32f4_discovery.h
diff --git a/port/stm32-f4discovery-cc256x-2/port/bsp/stm32f4_discovery_audio.c b/port/stm32-f4discovery-cc256x-2/bsp/stm32f4_discovery_audio.c
similarity index 100%
rename from port/stm32-f4discovery-cc256x-2/port/bsp/stm32f4_discovery_audio.c
rename to port/stm32-f4discovery-cc256x-2/bsp/stm32f4_discovery_audio.c
diff --git a/port/stm32-f4discovery-cc256x-2/port/bsp/stm32f4_discovery_audio.h b/port/stm32-f4discovery-cc256x-2/bsp/stm32f4_discovery_audio.h
similarity index 100%
rename from port/stm32-f4discovery-cc256x-2/port/bsp/stm32f4_discovery_audio.h
rename to port/stm32-f4discovery-cc256x-2/bsp/stm32f4_discovery_audio.h