diff --git a/port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/LICENSE.txt b/chipset/sx128x/SMTC_Drivers/sx1280-driver-c/LICENSE.txt
similarity index 100%
rename from port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/LICENSE.txt
rename to chipset/sx128x/SMTC_Drivers/sx1280-driver-c/LICENSE.txt
diff --git a/port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/RangingCorrection.h b/chipset/sx128x/SMTC_Drivers/sx1280-driver-c/RangingCorrection.h
similarity index 100%
rename from port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/RangingCorrection.h
rename to chipset/sx128x/SMTC_Drivers/sx1280-driver-c/RangingCorrection.h
diff --git a/port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/radio.h b/chipset/sx128x/SMTC_Drivers/sx1280-driver-c/radio.h
similarity index 100%
rename from port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/radio.h
rename to chipset/sx128x/SMTC_Drivers/sx1280-driver-c/radio.h
diff --git a/port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF10BW0400.h b/chipset/sx128x/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF10BW0400.h
similarity index 100%
rename from port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF10BW0400.h
rename to chipset/sx128x/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF10BW0400.h
diff --git a/port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF10BW0800.h b/chipset/sx128x/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF10BW0800.h
similarity index 100%
rename from port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF10BW0800.h
rename to chipset/sx128x/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF10BW0800.h
diff --git a/port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF10BW1600.h b/chipset/sx128x/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF10BW1600.h
similarity index 100%
rename from port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF10BW1600.h
rename to chipset/sx128x/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF10BW1600.h
diff --git a/port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF5BW0400.h b/chipset/sx128x/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF5BW0400.h
similarity index 100%
rename from port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF5BW0400.h
rename to chipset/sx128x/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF5BW0400.h
diff --git a/port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF5BW0800.h b/chipset/sx128x/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF5BW0800.h
similarity index 100%
rename from port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF5BW0800.h
rename to chipset/sx128x/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF5BW0800.h
diff --git a/port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF5BW1600.h b/chipset/sx128x/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF5BW1600.h
similarity index 100%
rename from port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF5BW1600.h
rename to chipset/sx128x/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF5BW1600.h
diff --git a/port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF6BW0400.h b/chipset/sx128x/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF6BW0400.h
similarity index 100%
rename from port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF6BW0400.h
rename to chipset/sx128x/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF6BW0400.h
diff --git a/port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF6BW0800.h b/chipset/sx128x/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF6BW0800.h
similarity index 100%
rename from port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF6BW0800.h
rename to chipset/sx128x/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF6BW0800.h
diff --git a/port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF6BW1600.h b/chipset/sx128x/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF6BW1600.h
similarity index 100%
rename from port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF6BW1600.h
rename to chipset/sx128x/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF6BW1600.h
diff --git a/port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF7BW0400.h b/chipset/sx128x/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF7BW0400.h
similarity index 100%
rename from port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF7BW0400.h
rename to chipset/sx128x/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF7BW0400.h
diff --git a/port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF7BW0800.h b/chipset/sx128x/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF7BW0800.h
similarity index 100%
rename from port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF7BW0800.h
rename to chipset/sx128x/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF7BW0800.h
diff --git a/port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF7BW1600.h b/chipset/sx128x/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF7BW1600.h
similarity index 100%
rename from port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF7BW1600.h
rename to chipset/sx128x/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF7BW1600.h
diff --git a/port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF8BW0400.h b/chipset/sx128x/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF8BW0400.h
similarity index 100%
rename from port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF8BW0400.h
rename to chipset/sx128x/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF8BW0400.h
diff --git a/port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF8BW0800.h b/chipset/sx128x/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF8BW0800.h
similarity index 100%
rename from port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF8BW0800.h
rename to chipset/sx128x/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF8BW0800.h
diff --git a/port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF8BW1600.h b/chipset/sx128x/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF8BW1600.h
similarity index 100%
rename from port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF8BW1600.h
rename to chipset/sx128x/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF8BW1600.h
diff --git a/port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF9BW0400.h b/chipset/sx128x/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF9BW0400.h
similarity index 100%
rename from port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF9BW0400.h
rename to chipset/sx128x/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF9BW0400.h
diff --git a/port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF9BW0800.h b/chipset/sx128x/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF9BW0800.h
similarity index 100%
rename from port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF9BW0800.h
rename to chipset/sx128x/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF9BW0800.h
diff --git a/port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF9BW1600.h b/chipset/sx128x/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF9BW1600.h
similarity index 100%
rename from port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF9BW1600.h
rename to chipset/sx128x/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrectionSF9BW1600.h
diff --git a/port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrection_defines.h b/chipset/sx128x/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrection_defines.h
similarity index 100%
rename from port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrection_defines.h
rename to chipset/sx128x/SMTC_Drivers/sx1280-driver-c/rangingCorrection/rangingCorrection_defines.h
diff --git a/port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/readme.md b/chipset/sx128x/SMTC_Drivers/sx1280-driver-c/readme.md
similarity index 100%
rename from port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/readme.md
rename to chipset/sx128x/SMTC_Drivers/sx1280-driver-c/readme.md
diff --git a/port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/sx1280-hal.c b/chipset/sx128x/SMTC_Drivers/sx1280-driver-c/sx1280-hal.c
similarity index 100%
rename from port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/sx1280-hal.c
rename to chipset/sx128x/SMTC_Drivers/sx1280-driver-c/sx1280-hal.c
diff --git a/port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/sx1280-hal.h b/chipset/sx128x/SMTC_Drivers/sx1280-driver-c/sx1280-hal.h
similarity index 100%
rename from port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/sx1280-hal.h
rename to chipset/sx128x/SMTC_Drivers/sx1280-driver-c/sx1280-hal.h
diff --git a/port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/sx1280.c b/chipset/sx128x/SMTC_Drivers/sx1280-driver-c/sx1280.c
similarity index 100%
rename from port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/sx1280.c
rename to chipset/sx128x/SMTC_Drivers/sx1280-driver-c/sx1280.c
diff --git a/port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/sx1280.h b/chipset/sx128x/SMTC_Drivers/sx1280-driver-c/sx1280.h
similarity index 100%
rename from port/stm32-sx1280/SMTC_Drivers/sx1280-driver-c/sx1280.h
rename to chipset/sx128x/SMTC_Drivers/sx1280-driver-c/sx1280.h
diff --git a/port/stm32-sx1280/SMTC_Drivers/utilities.h b/chipset/sx128x/SMTC_Drivers/utilities.h
similarity index 100%
rename from port/stm32-sx1280/SMTC_Drivers/utilities.h
rename to chipset/sx128x/SMTC_Drivers/utilities.h
diff --git a/port/stm32-sx1280/Makefile b/port/stm32-sx1280/Makefile
index a57b7bb42..8792537e9 100644
--- a/port/stm32-sx1280/Makefile
+++ b/port/stm32-sx1280/Makefile
@@ -83,6 +83,8 @@ ${BTSTACK_ROOT}/chipset/sx128x/controller.c \
 ${BTSTACK_ROOT}/chipset/sx128x/hci_event.c \
 ${BTSTACK_ROOT}/chipset/sx128x//hopping.c \
 ${BTSTACK_ROOT}/chipset/sx128x//ll_sx1280.c \
+${BTSTACK_ROOT}/chipset/sx128x/SMTC_Drivers/sx1280-driver-c/sx1280-hal.c \
+${BTSTACK_ROOT}/chipset/sx128x/SMTC_Drivers/sx1280-driver-c/sx1280.c \
 Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal.c \
 Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_cortex.c \
 Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_dma.c \
@@ -105,8 +107,6 @@ Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_tim.c \
 Drivers/STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_tim_ex.c \
 port/hal_timer.c \
 port/btstack_port.c \
-SMTC_Drivers/sx1280-driver-c/sx1280-hal.c \
-SMTC_Drivers/sx1280-driver-c/sx1280.c \
 Src/main.c \
 Src/stm32l4xx_hal_msp.c \
 Src/stm32l4xx_it.c \
@@ -180,6 +180,8 @@ C_INCLUDES =  \
 -I ${BTSTACK_ROOT}/src/ble \
 -I ${BTSTACK_ROOT}/src/ble/gatt-service \
 -I ${BTSTACK_ROOT}/chipset/sx128x \
+-I ${BTSTACK_ROOT}/chipset/sx128x/SMTC_Drivers/ \
+-I ${BTSTACK_ROOT}/chipset/sx128x/SMTC_Drivers/sx1280-driver-c/ \
 -I controller \
 -I Drivers/CMSIS/Device/ST/STM32L4xx/Include \
 -I Drivers/CMSIS/Include \
@@ -187,8 +189,6 @@ C_INCLUDES =  \
 -I Drivers/STM32L4xx_HAL_Driver/Inc/Legacy \
 -I Inc \
 -I port \
--I SMTC_Drivers/ \
--I SMTC_Drivers/sx1280-driver-c/ \
 -I .
 
 # compile gcc flags