diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/common/COMPONENT_WHD/CMakeLists.txt b/connectivity/drivers/wifi/COMPONENT_WHD/network/CMakeLists.txt
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/common/COMPONENT_WHD/CMakeLists.txt
rename to connectivity/drivers/wifi/COMPONENT_WHD/network/CMakeLists.txt
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/common/COMPONENT_WHD/cy_network_buffer.c b/connectivity/drivers/wifi/COMPONENT_WHD/network/cy_network_buffer.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/common/COMPONENT_WHD/cy_network_buffer.c
rename to connectivity/drivers/wifi/COMPONENT_WHD/network/cy_network_buffer.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/common/COMPONENT_WHD/cy_network_buffer.h b/connectivity/drivers/wifi/COMPONENT_WHD/network/cy_network_buffer.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/common/COMPONENT_WHD/cy_network_buffer.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/network/cy_network_buffer.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/common/COMPONENT_WHD/cy_wifi_fw_section.h b/connectivity/drivers/wifi/COMPONENT_WHD/network/cy_wifi_fw_section.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/common/COMPONENT_WHD/cy_wifi_fw_section.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/network/cy_wifi_fw_section.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/common/COMPONENT_WHD/cybsp_wifi.c b/connectivity/drivers/wifi/COMPONENT_WHD/network/cybsp_wifi.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/common/COMPONENT_WHD/cybsp_wifi.c
rename to connectivity/drivers/wifi/COMPONENT_WHD/network/cybsp_wifi.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/common/COMPONENT_WHD/cybsp_wifi.h b/connectivity/drivers/wifi/COMPONENT_WHD/network/cybsp_wifi.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/common/COMPONENT_WHD/cybsp_wifi.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/network/cybsp_wifi.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/common/COMPONENT_WHD/mbed_lib.json b/connectivity/drivers/wifi/COMPONENT_WHD/network/mbed_lib.json
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/common/COMPONENT_WHD/mbed_lib.json
rename to connectivity/drivers/wifi/COMPONENT_WHD/network/mbed_lib.json