diff --git a/connectivity/drivers/ble/COMPONENT_CYW43XXX/CyH4TransportDriver.cpp b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/CyH4TransportDriver.cpp
similarity index 100%
rename from connectivity/drivers/ble/COMPONENT_CYW43XXX/CyH4TransportDriver.cpp
rename to connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/CyH4TransportDriver.cpp
diff --git a/connectivity/drivers/ble/COMPONENT_CYW43XXX/CyH4TransportDriver.h b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/CyH4TransportDriver.h
similarity index 100%
rename from connectivity/drivers/ble/COMPONENT_CYW43XXX/CyH4TransportDriver.h
rename to connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/CyH4TransportDriver.h
diff --git a/connectivity/drivers/ble/COMPONENT_CYW43XXX/HCIDriver.cpp b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/HCIDriver.cpp
similarity index 100%
rename from connectivity/drivers/ble/COMPONENT_CYW43XXX/HCIDriver.cpp
rename to connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/HCIDriver.cpp
diff --git a/connectivity/drivers/ble/COMPONENT_CYW43XXX/TARGET_PSOC6/cy_bt_cordio_cfg.cpp b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/TARGET_PSOC6/cy_bt_cordio_cfg.cpp
similarity index 100%
rename from connectivity/drivers/ble/COMPONENT_CYW43XXX/TARGET_PSOC6/cy_bt_cordio_cfg.cpp
rename to connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/TARGET_PSOC6/cy_bt_cordio_cfg.cpp
diff --git a/connectivity/drivers/ble/COMPONENT_CYW43XXX/firmware/COMPONENT_43012/w_bt_firmware_controller.c b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/firmware/COMPONENT_43012/w_bt_firmware_controller.c
similarity index 100%
rename from connectivity/drivers/ble/COMPONENT_CYW43XXX/firmware/COMPONENT_43012/w_bt_firmware_controller.c
rename to connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/firmware/COMPONENT_43012/w_bt_firmware_controller.c
diff --git a/connectivity/drivers/ble/COMPONENT_CYW43XXX/firmware/COMPONENT_43438/w_bt_firmware_controller.c b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/firmware/COMPONENT_43438/w_bt_firmware_controller.c
similarity index 100%
rename from connectivity/drivers/ble/COMPONENT_CYW43XXX/firmware/COMPONENT_43438/w_bt_firmware_controller.c
rename to connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/firmware/COMPONENT_43438/w_bt_firmware_controller.c
diff --git a/connectivity/drivers/ble/COMPONENT_CYW43XXX/firmware/COMPONENT_4343W/w_bt_firmware_controller.c b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/firmware/COMPONENT_4343W/w_bt_firmware_controller.c
similarity index 100%
rename from connectivity/drivers/ble/COMPONENT_CYW43XXX/firmware/COMPONENT_4343W/w_bt_firmware_controller.c
rename to connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/firmware/COMPONENT_4343W/w_bt_firmware_controller.c
diff --git a/connectivity/drivers/ble/COMPONENT_CYW43XXX/firmware/TARGET_CYW9P62S1_43012EVB_01/w_bt_firmware_controller.c b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/firmware/TARGET_CYW9P62S1_43012EVB_01/w_bt_firmware_controller.c
similarity index 100%
rename from connectivity/drivers/ble/COMPONENT_CYW43XXX/firmware/TARGET_CYW9P62S1_43012EVB_01/w_bt_firmware_controller.c
rename to connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/firmware/TARGET_CYW9P62S1_43012EVB_01/w_bt_firmware_controller.c
diff --git a/connectivity/drivers/ble/COMPONENT_CYW43XXX/mbed_lib.json b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/mbed_lib.json
similarity index 100%
rename from connectivity/drivers/ble/COMPONENT_CYW43XXX/mbed_lib.json
rename to connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/mbed_lib.json
diff --git a/connectivity/drivers/ble/TARGET_CY8C63XX/Psoc6BLE.cpp b/connectivity/drivers/ble/FEATURE_BLE/TARGET_CY8C63XX/Psoc6BLE.cpp
similarity index 100%
rename from connectivity/drivers/ble/TARGET_CY8C63XX/Psoc6BLE.cpp
rename to connectivity/drivers/ble/FEATURE_BLE/TARGET_CY8C63XX/Psoc6BLE.cpp
diff --git a/connectivity/drivers/ble/TARGET_CY8C63XX/drivers/IPCPipeTransportDriver.cpp b/connectivity/drivers/ble/FEATURE_BLE/TARGET_CY8C63XX/drivers/IPCPipeTransportDriver.cpp
similarity index 100%
rename from connectivity/drivers/ble/TARGET_CY8C63XX/drivers/IPCPipeTransportDriver.cpp
rename to connectivity/drivers/ble/FEATURE_BLE/TARGET_CY8C63XX/drivers/IPCPipeTransportDriver.cpp
diff --git a/connectivity/drivers/ble/TARGET_CY8C63XX/drivers/IPCPipeTransportDriver.h b/connectivity/drivers/ble/FEATURE_BLE/TARGET_CY8C63XX/drivers/IPCPipeTransportDriver.h
similarity index 100%
rename from connectivity/drivers/ble/TARGET_CY8C63XX/drivers/IPCPipeTransportDriver.h
rename to connectivity/drivers/ble/FEATURE_BLE/TARGET_CY8C63XX/drivers/IPCPipeTransportDriver.h
diff --git a/connectivity/drivers/ble/TARGET_CY8C63XX/mbed_lib.json b/connectivity/drivers/ble/FEATURE_BLE/TARGET_CY8C63XX/mbed_lib.json
similarity index 100%
rename from connectivity/drivers/ble/TARGET_CY8C63XX/mbed_lib.json
rename to connectivity/drivers/ble/FEATURE_BLE/TARGET_CY8C63XX/mbed_lib.json
diff --git a/connectivity/drivers/ble/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_MCU_NRF52840/mbed_lib.json b/connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_MCU_NRF52840/mbed_lib.json
similarity index 100%
rename from connectivity/drivers/ble/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_MCU_NRF52840/mbed_lib.json
rename to connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_MCU_NRF52840/mbed_lib.json
diff --git a/connectivity/drivers/ble/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/NRFCordioHCIDriver.cpp b/connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/NRFCordioHCIDriver.cpp
similarity index 100%
rename from connectivity/drivers/ble/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/NRFCordioHCIDriver.cpp
rename to connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/NRFCordioHCIDriver.cpp
diff --git a/connectivity/drivers/ble/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/NRFCordioHCIDriver.h b/connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/NRFCordioHCIDriver.h
similarity index 100%
rename from connectivity/drivers/ble/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/NRFCordioHCIDriver.h
rename to connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/NRFCordioHCIDriver.h
diff --git a/connectivity/drivers/ble/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/NRFCordioHCITransportDriver.cpp b/connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/NRFCordioHCITransportDriver.cpp
similarity index 100%
rename from connectivity/drivers/ble/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/NRFCordioHCITransportDriver.cpp
rename to connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/NRFCordioHCITransportDriver.cpp
diff --git a/connectivity/drivers/ble/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/NRFCordioHCITransportDriver.h b/connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/NRFCordioHCITransportDriver.h
similarity index 100%
rename from connectivity/drivers/ble/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/NRFCordioHCITransportDriver.h
rename to connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/NRFCordioHCITransportDriver.h
diff --git a/connectivity/drivers/ble/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/README.md b/connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/README.md
similarity index 100%
rename from connectivity/drivers/ble/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/README.md
rename to connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/README.md
diff --git a/connectivity/drivers/ble/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/mbed_lib.json b/connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/mbed_lib.json
similarity index 100%
rename from connectivity/drivers/ble/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/mbed_lib.json
rename to connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/mbed_lib.json
diff --git a/connectivity/drivers/ble/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_bb.c b/connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_bb.c
similarity index 100%
rename from connectivity/drivers/ble/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_bb.c
rename to connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_bb.c
diff --git a/connectivity/drivers/ble/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_bb_ble.c b/connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_bb_ble.c
similarity index 100%
rename from connectivity/drivers/ble/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_bb_ble.c
rename to connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_bb_ble.c
diff --git a/connectivity/drivers/ble/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_bb_ble_rf.c b/connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_bb_ble_rf.c
similarity index 100%
rename from connectivity/drivers/ble/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_bb_ble_rf.c
rename to connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_bb_ble_rf.c
diff --git a/connectivity/drivers/ble/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_cfg.c b/connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_cfg.c
similarity index 100%
rename from connectivity/drivers/ble/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_cfg.c
rename to connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_cfg.c
diff --git a/connectivity/drivers/ble/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_crypto.c b/connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_crypto.c
similarity index 100%
rename from connectivity/drivers/ble/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_crypto.c
rename to connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_crypto.c
diff --git a/connectivity/drivers/ble/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_timer.c b/connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_timer.c
similarity index 100%
rename from connectivity/drivers/ble/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_timer.c
rename to connectivity/drivers/ble/FEATURE_BLE/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_timer.c
diff --git a/connectivity/drivers/ble/TARGET_STM32WB/HCIDriver.cpp b/connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/HCIDriver.cpp
similarity index 100%
rename from connectivity/drivers/ble/TARGET_STM32WB/HCIDriver.cpp
rename to connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/HCIDriver.cpp
diff --git a/connectivity/drivers/ble/TARGET_STM32WB/STM32Cube_FW/mbox_def.h b/connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/STM32Cube_FW/mbox_def.h
similarity index 100%
rename from connectivity/drivers/ble/TARGET_STM32WB/STM32Cube_FW/mbox_def.h
rename to connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/STM32Cube_FW/mbox_def.h
diff --git a/connectivity/drivers/ble/TARGET_STM32WB/STM32Cube_FW/shci.c b/connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/STM32Cube_FW/shci.c
similarity index 100%
rename from connectivity/drivers/ble/TARGET_STM32WB/STM32Cube_FW/shci.c
rename to connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/STM32Cube_FW/shci.c
diff --git a/connectivity/drivers/ble/TARGET_STM32WB/STM32Cube_FW/shci.h b/connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/STM32Cube_FW/shci.h
similarity index 100%
rename from connectivity/drivers/ble/TARGET_STM32WB/STM32Cube_FW/shci.h
rename to connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/STM32Cube_FW/shci.h
diff --git a/connectivity/drivers/ble/TARGET_STM32WB/STM32Cube_FW/shci_tl.c b/connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/STM32Cube_FW/shci_tl.c
similarity index 100%
rename from connectivity/drivers/ble/TARGET_STM32WB/STM32Cube_FW/shci_tl.c
rename to connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/STM32Cube_FW/shci_tl.c
diff --git a/connectivity/drivers/ble/TARGET_STM32WB/STM32Cube_FW/shci_tl.h b/connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/STM32Cube_FW/shci_tl.h
similarity index 100%
rename from connectivity/drivers/ble/TARGET_STM32WB/STM32Cube_FW/shci_tl.h
rename to connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/STM32Cube_FW/shci_tl.h
diff --git a/connectivity/drivers/ble/TARGET_STM32WB/STM32Cube_FW/stm32_wpan_common.h b/connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/STM32Cube_FW/stm32_wpan_common.h
similarity index 100%
rename from connectivity/drivers/ble/TARGET_STM32WB/STM32Cube_FW/stm32_wpan_common.h
rename to connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/STM32Cube_FW/stm32_wpan_common.h
diff --git a/connectivity/drivers/ble/TARGET_STM32WB/STM32Cube_FW/stm_list.c b/connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/STM32Cube_FW/stm_list.c
similarity index 100%
rename from connectivity/drivers/ble/TARGET_STM32WB/STM32Cube_FW/stm_list.c
rename to connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/STM32Cube_FW/stm_list.c
diff --git a/connectivity/drivers/ble/TARGET_STM32WB/STM32Cube_FW/stm_list.h b/connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/STM32Cube_FW/stm_list.h
similarity index 100%
rename from connectivity/drivers/ble/TARGET_STM32WB/STM32Cube_FW/stm_list.h
rename to connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/STM32Cube_FW/stm_list.h
diff --git a/connectivity/drivers/ble/TARGET_STM32WB/STM32Cube_FW/tl.h b/connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/STM32Cube_FW/tl.h
similarity index 100%
rename from connectivity/drivers/ble/TARGET_STM32WB/STM32Cube_FW/tl.h
rename to connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/STM32Cube_FW/tl.h
diff --git a/connectivity/drivers/ble/TARGET_STM32WB/STM32Cube_FW/tl_mbox.c b/connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/STM32Cube_FW/tl_mbox.c
similarity index 100%
rename from connectivity/drivers/ble/TARGET_STM32WB/STM32Cube_FW/tl_mbox.c
rename to connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/STM32Cube_FW/tl_mbox.c
diff --git a/connectivity/drivers/ble/TARGET_STM32WB/hw_ipcc.c b/connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/hw_ipcc.c
similarity index 100%
rename from connectivity/drivers/ble/TARGET_STM32WB/hw_ipcc.c
rename to connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/hw_ipcc.c
diff --git a/connectivity/drivers/ble/TARGET_STM32WB/mbed_lib.json b/connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/mbed_lib.json
similarity index 100%
rename from connectivity/drivers/ble/TARGET_STM32WB/mbed_lib.json
rename to connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/mbed_lib.json