diff --git a/.codecheckignore b/.codecheckignore
index 5232c65a58f..62e12b56f4e 100644
--- a/.codecheckignore
+++ b/.codecheckignore
@@ -6,6 +6,7 @@
 ^connectivity/libraries/ppp
 ^connectivity/drivers/emac
 ^connectivity/drivers/mbedtls
+^connectivity/drivers/wifi/COMPONENT_WHD
 ^connectivity/mbedtls
 ^features/frameworks
 ^connectivity/lwipstack/lwip
diff --git a/connectivity/drivers/emac/CMakeLists.txt b/connectivity/drivers/emac/CMakeLists.txt
index 21f104947c2..56e7f474eab 100644
--- a/connectivity/drivers/emac/CMakeLists.txt
+++ b/connectivity/drivers/emac/CMakeLists.txt
@@ -25,6 +25,10 @@ elseif("Silicon_Labs" IN_LIST MBED_TARGET_LABELS)
     add_subdirectory(TARGET_Silicon_Labs)
 endif()
 
+if("WHD" IN_LIST MBED_TARGET_LABELS)
+    add_subdirectory(COMPONENT_WHD)
+endif()
+
 target_link_libraries(mbed-emac
     INTERFACE
         mbed-netsocket
diff --git a/connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/CMakeLists.txt b/connectivity/drivers/emac/COMPONENT_WHD/CMakeLists.txt
similarity index 100%
rename from connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/CMakeLists.txt
rename to connectivity/drivers/emac/COMPONENT_WHD/CMakeLists.txt
diff --git a/connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/interface/CyDhcpServer.cpp b/connectivity/drivers/emac/COMPONENT_WHD/interface/CyDhcpServer.cpp
similarity index 100%
rename from connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/interface/CyDhcpServer.cpp
rename to connectivity/drivers/emac/COMPONENT_WHD/interface/CyDhcpServer.cpp
diff --git a/connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/interface/CyDhcpServer.h b/connectivity/drivers/emac/COMPONENT_WHD/interface/CyDhcpServer.h
similarity index 99%
rename from connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/interface/CyDhcpServer.h
rename to connectivity/drivers/emac/COMPONENT_WHD/interface/CyDhcpServer.h
index b11d0317cd6..fd22eaec475 100644
--- a/connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/interface/CyDhcpServer.h
+++ b/connectivity/drivers/emac/COMPONENT_WHD/interface/CyDhcpServer.h
@@ -100,7 +100,7 @@ class CyDhcpServer {
     NetworkStack *_nstack = NULL;
     NetworkInterface *_niface = NULL;
     UDPSocket _socket;
-    Thread _thread;
+    rtos::Thread _thread;
     bool _running = false;
 
     cy_ip_addr_t _available_addr;
diff --git a/connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/interface/WhdAccessPoint.cpp b/connectivity/drivers/emac/COMPONENT_WHD/interface/WhdAccessPoint.cpp
similarity index 100%
rename from connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/interface/WhdAccessPoint.cpp
rename to connectivity/drivers/emac/COMPONENT_WHD/interface/WhdAccessPoint.cpp
diff --git a/connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/interface/WhdAccessPoint.h b/connectivity/drivers/emac/COMPONENT_WHD/interface/WhdAccessPoint.h
similarity index 100%
rename from connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/interface/WhdAccessPoint.h
rename to connectivity/drivers/emac/COMPONENT_WHD/interface/WhdAccessPoint.h
diff --git a/connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/interface/WhdSTAInterface.cpp b/connectivity/drivers/emac/COMPONENT_WHD/interface/WhdSTAInterface.cpp
similarity index 99%
rename from connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/interface/WhdSTAInterface.cpp
rename to connectivity/drivers/emac/COMPONENT_WHD/interface/WhdSTAInterface.cpp
index af14a7e2c43..6fec15adb08 100644
--- a/connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/interface/WhdSTAInterface.cpp
+++ b/connectivity/drivers/emac/COMPONENT_WHD/interface/WhdSTAInterface.cpp
@@ -27,6 +27,7 @@
 #include "whd_emac.h"
 #include "whd_wifi_api.h"
 #include "whd_wlioctl.h"
+#include "cy_utils.h"
 
 #define CMP_MAC( a, b )  (((((unsigned char*)a)[0])==(((unsigned char*)b)[0]))&& \
                           ((((unsigned char*)a)[1])==(((unsigned char*)b)[1]))&& \
diff --git a/connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/interface/WhdSTAInterface.h b/connectivity/drivers/emac/COMPONENT_WHD/interface/WhdSTAInterface.h
similarity index 100%
rename from connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/interface/WhdSTAInterface.h
rename to connectivity/drivers/emac/COMPONENT_WHD/interface/WhdSTAInterface.h
diff --git a/connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/interface/WhdSoftAPInterface.cpp b/connectivity/drivers/emac/COMPONENT_WHD/interface/WhdSoftAPInterface.cpp
similarity index 100%
rename from connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/interface/WhdSoftAPInterface.cpp
rename to connectivity/drivers/emac/COMPONENT_WHD/interface/WhdSoftAPInterface.cpp
diff --git a/connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/interface/WhdSoftAPInterface.h b/connectivity/drivers/emac/COMPONENT_WHD/interface/WhdSoftAPInterface.h
similarity index 100%
rename from connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/interface/WhdSoftAPInterface.h
rename to connectivity/drivers/emac/COMPONENT_WHD/interface/WhdSoftAPInterface.h
diff --git a/connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/interface/emac_eapol.h b/connectivity/drivers/emac/COMPONENT_WHD/interface/emac_eapol.h
similarity index 100%
rename from connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/interface/emac_eapol.h
rename to connectivity/drivers/emac/COMPONENT_WHD/interface/emac_eapol.h
diff --git a/connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/interface/whd_emac.cpp b/connectivity/drivers/emac/COMPONENT_WHD/interface/whd_emac.cpp
similarity index 100%
rename from connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/interface/whd_emac.cpp
rename to connectivity/drivers/emac/COMPONENT_WHD/interface/whd_emac.cpp
diff --git a/connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/interface/whd_emac.h b/connectivity/drivers/emac/COMPONENT_WHD/interface/whd_emac.h
similarity index 100%
rename from connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/interface/whd_emac.h
rename to connectivity/drivers/emac/COMPONENT_WHD/interface/whd_emac.h
diff --git a/connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/interface/whd_interface.cpp b/connectivity/drivers/emac/COMPONENT_WHD/interface/whd_interface.cpp
similarity index 100%
rename from connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/interface/whd_interface.cpp
rename to connectivity/drivers/emac/COMPONENT_WHD/interface/whd_interface.cpp
diff --git a/connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/interface/whd_interface.h b/connectivity/drivers/emac/COMPONENT_WHD/interface/whd_interface.h
similarity index 100%
rename from connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/interface/whd_interface.h
rename to connectivity/drivers/emac/COMPONENT_WHD/interface/whd_interface.h
diff --git a/connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/network/whd_network.h b/connectivity/drivers/emac/COMPONENT_WHD/network/whd_network.h
similarity index 100%
rename from connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/network/whd_network.h
rename to connectivity/drivers/emac/COMPONENT_WHD/network/whd_network.h
diff --git a/connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/utils/cydhcp_server_debug.cpp b/connectivity/drivers/emac/COMPONENT_WHD/utils/cydhcp_server_debug.cpp
similarity index 100%
rename from connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/utils/cydhcp_server_debug.cpp
rename to connectivity/drivers/emac/COMPONENT_WHD/utils/cydhcp_server_debug.cpp
diff --git a/connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/utils/cynetwork_utils.c b/connectivity/drivers/emac/COMPONENT_WHD/utils/cynetwork_utils.c
similarity index 100%
rename from connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/utils/cynetwork_utils.c
rename to connectivity/drivers/emac/COMPONENT_WHD/utils/cynetwork_utils.c
diff --git a/connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/utils/cynetwork_utils.h b/connectivity/drivers/emac/COMPONENT_WHD/utils/cynetwork_utils.h
similarity index 100%
rename from connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/utils/cynetwork_utils.h
rename to connectivity/drivers/emac/COMPONENT_WHD/utils/cynetwork_utils.h
diff --git a/connectivity/drivers/emac/TARGET_Cypress/CMakeLists.txt b/connectivity/drivers/emac/TARGET_Cypress/CMakeLists.txt
index 9c4697181d9..748188c205f 100644
--- a/connectivity/drivers/emac/TARGET_Cypress/CMakeLists.txt
+++ b/connectivity/drivers/emac/TARGET_Cypress/CMakeLists.txt
@@ -4,7 +4,3 @@
 if("SCL" IN_LIST MBED_TARGET_LABELS)
     add_subdirectory(COMPONENT_SCL)
 endif()
-
-if("WHD" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(COMPONENT_WHD)
-endif()
diff --git a/connectivity/drivers/wifi/CMakeLists.txt b/connectivity/drivers/wifi/CMakeLists.txt
index 5a7bd97647e..6ca3b2f0923 100644
--- a/connectivity/drivers/wifi/CMakeLists.txt
+++ b/connectivity/drivers/wifi/CMakeLists.txt
@@ -3,6 +3,8 @@
 
 add_subdirectory(TARGET_WICED EXCLUDE_FROM_ALL)
 
+add_subdirectory(COMPONENT_WHD EXCLUDE_FROM_ALL)
+
 add_subdirectory(esp8266-driver)
 
 target_link_libraries(mbed-wifi
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/CMakeLists.txt b/connectivity/drivers/wifi/COMPONENT_WHD/CMakeLists.txt
similarity index 99%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/CMakeLists.txt
rename to connectivity/drivers/wifi/COMPONENT_WHD/CMakeLists.txt
index 5127c517342..a273a0a69c1 100644
--- a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/CMakeLists.txt
+++ b/connectivity/drivers/wifi/COMPONENT_WHD/CMakeLists.txt
@@ -1,6 +1,8 @@
 # Copyright (c) 2020-2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+add_subdirectory(network EXCLUDE_FROM_ALL)
+
 add_library(mbed-cy-psoc6-whd-43012 INTERFACE)
 target_include_directories(mbed-cy-psoc6-whd-43012
     INTERFACE
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/generated_mac_address.txt b/connectivity/drivers/wifi/COMPONENT_WHD/generated_mac_address.txt
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/generated_mac_address.txt
rename to connectivity/drivers/wifi/COMPONENT_WHD/generated_mac_address.txt
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/inc/whd.h b/connectivity/drivers/wifi/COMPONENT_WHD/inc/whd.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/inc/whd.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/inc/whd.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/inc/whd_events.h b/connectivity/drivers/wifi/COMPONENT_WHD/inc/whd_events.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/inc/whd_events.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/inc/whd_events.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/inc/whd_network_types.h b/connectivity/drivers/wifi/COMPONENT_WHD/inc/whd_network_types.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/inc/whd_network_types.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/inc/whd_network_types.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/inc/whd_resource_api.h b/connectivity/drivers/wifi/COMPONENT_WHD/inc/whd_resource_api.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/inc/whd_resource_api.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/inc/whd_resource_api.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/inc/whd_types.h b/connectivity/drivers/wifi/COMPONENT_WHD/inc/whd_types.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/inc/whd_types.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/inc/whd_types.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/inc/whd_version.h b/connectivity/drivers/wifi/COMPONENT_WHD/inc/whd_version.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/inc/whd_version.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/inc/whd_version.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/inc/whd_wifi_api.h b/connectivity/drivers/wifi/COMPONENT_WHD/inc/whd_wifi_api.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/inc/whd_wifi_api.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/inc/whd_wifi_api.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/mbed_lib.json b/connectivity/drivers/wifi/COMPONENT_WHD/mbed_lib.json
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/mbed_lib.json
rename to connectivity/drivers/wifi/COMPONENT_WHD/mbed_lib.json
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
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/LICENSE-permissive-binary-license-1.0.txt b/connectivity/drivers/wifi/COMPONENT_WHD/resources/LICENSE-permissive-binary-license-1.0.txt
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/LICENSE-permissive-binary-license-1.0.txt
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/LICENSE-permissive-binary-license-1.0.txt
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012C0-mfgtest.bin b/connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012C0-mfgtest.bin
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012C0-mfgtest.bin
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012C0-mfgtest.bin
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012C0-mfgtest.clm_blob b/connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012C0-mfgtest.clm_blob
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012C0-mfgtest.clm_blob
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012C0-mfgtest.clm_blob
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012C0-mfgtest_bin.c b/connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012C0-mfgtest_bin.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012C0-mfgtest_bin.c
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012C0-mfgtest_bin.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012C0-mfgtest_clm_blob.c b/connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012C0-mfgtest_clm_blob.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012C0-mfgtest_clm_blob.c
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012C0-mfgtest_clm_blob.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012C0.bin b/connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012C0.bin
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012C0.bin
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012C0.bin
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012C0.clm_blob b/connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012C0.clm_blob
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012C0.clm_blob
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012C0.clm_blob
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012C0_bin.c b/connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012C0_bin.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012C0_bin.c
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012C0_bin.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012C0_clm_blob.c b/connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012C0_clm_blob.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012C0_clm_blob.c
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_43012/43012C0_clm_blob.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43012/resources.h b/connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_43012/resources.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43012/resources.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_43012/resources.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43438/43438A1-mfgtest.bin b/connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_43438/43438A1-mfgtest.bin
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43438/43438A1-mfgtest.bin
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_43438/43438A1-mfgtest.bin
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43438/43438A1-mfgtest.clm_blob b/connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_43438/43438A1-mfgtest.clm_blob
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43438/43438A1-mfgtest.clm_blob
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_43438/43438A1-mfgtest.clm_blob
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43438/43438A1-mfgtest_bin.c b/connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_43438/43438A1-mfgtest_bin.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43438/43438A1-mfgtest_bin.c
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_43438/43438A1-mfgtest_bin.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43438/43438A1-mfgtest_clm_blob.c b/connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_43438/43438A1-mfgtest_clm_blob.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43438/43438A1-mfgtest_clm_blob.c
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_43438/43438A1-mfgtest_clm_blob.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43438/43438A1.bin b/connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_43438/43438A1.bin
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43438/43438A1.bin
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_43438/43438A1.bin
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43438/43438A1.clm_blob b/connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_43438/43438A1.clm_blob
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43438/43438A1.clm_blob
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_43438/43438A1.clm_blob
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43438/43438A1_bin.c b/connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_43438/43438A1_bin.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43438/43438A1_bin.c
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_43438/43438A1_bin.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43438/43438A1_clm_blob.c b/connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_43438/43438A1_clm_blob.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43438/43438A1_clm_blob.c
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_43438/43438A1_clm_blob.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43438/resources.h b/connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_43438/resources.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_43438/resources.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_43438/resources.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_4343W/4343WA1-mfgtest.bin b/connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_4343W/4343WA1-mfgtest.bin
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_4343W/4343WA1-mfgtest.bin
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_4343W/4343WA1-mfgtest.bin
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_4343W/4343WA1-mfgtest.clm_blob b/connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_4343W/4343WA1-mfgtest.clm_blob
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_4343W/4343WA1-mfgtest.clm_blob
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_4343W/4343WA1-mfgtest.clm_blob
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_4343W/4343WA1-mfgtest_bin.c b/connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_4343W/4343WA1-mfgtest_bin.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_4343W/4343WA1-mfgtest_bin.c
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_4343W/4343WA1-mfgtest_bin.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_4343W/4343WA1-mfgtest_clm_blob.c b/connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_4343W/4343WA1-mfgtest_clm_blob.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_4343W/4343WA1-mfgtest_clm_blob.c
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_4343W/4343WA1-mfgtest_clm_blob.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_4343W/4343WA1.bin b/connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_4343W/4343WA1.bin
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_4343W/4343WA1.bin
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_4343W/4343WA1.bin
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_4343W/4343WA1.clm_blob b/connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_4343W/4343WA1.clm_blob
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_4343W/4343WA1.clm_blob
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_4343W/4343WA1.clm_blob
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_4343W/4343WA1_bin.c b/connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_4343W/4343WA1_bin.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_4343W/4343WA1_bin.c
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_4343W/4343WA1_bin.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_4343W/4343WA1_clm_blob.c b/connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_4343W/4343WA1_clm_blob.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_4343W/4343WA1_clm_blob.c
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_4343W/4343WA1_clm_blob.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_4343W/resources.h b/connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_4343W/resources.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_4343W/resources.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_4343W/resources.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_4373/4373A0-mfgtest.bin b/connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_4373/4373A0-mfgtest.bin
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_4373/4373A0-mfgtest.bin
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_4373/4373A0-mfgtest.bin
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_4373/4373A0-mfgtest.clm_blob b/connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_4373/4373A0-mfgtest.clm_blob
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_4373/4373A0-mfgtest.clm_blob
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_4373/4373A0-mfgtest.clm_blob
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_4373/4373A0-mfgtest_bin.c b/connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_4373/4373A0-mfgtest_bin.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_4373/4373A0-mfgtest_bin.c
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_4373/4373A0-mfgtest_bin.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_4373/4373A0-mfgtest_clm_blob.c b/connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_4373/4373A0-mfgtest_clm_blob.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_4373/4373A0-mfgtest_clm_blob.c
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_4373/4373A0-mfgtest_clm_blob.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_4373/4373A0.bin b/connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_4373/4373A0.bin
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_4373/4373A0.bin
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_4373/4373A0.bin
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_4373/4373A0.clm_blob b/connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_4373/4373A0.clm_blob
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_4373/4373A0.clm_blob
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_4373/4373A0.clm_blob
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_4373/4373A0_bin.c b/connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_4373/4373A0_bin.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_4373/4373A0_bin.c
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_4373/4373A0_bin.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_4373/4373A0_clm_blob.c b/connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_4373/4373A0_clm_blob.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_4373/4373A0_clm_blob.c
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_4373/4373A0_clm_blob.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_4373/resources.h b/connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_4373/resources.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/firmware/COMPONENT_4373/resources.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware/COMPONENT_4373/resources.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/nvram/TARGET_CY8CKIT_062S2_43012/wifi_nvram_image.h b/connectivity/drivers/wifi/COMPONENT_WHD/resources/nvram/TARGET_CY8CKIT_062S2_43012/wifi_nvram_image.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/nvram/TARGET_CY8CKIT_062S2_43012/wifi_nvram_image.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/nvram/TARGET_CY8CKIT_062S2_43012/wifi_nvram_image.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/nvram/TARGET_CY8CKIT_062S2_4343W/wifi_nvram_image.h b/connectivity/drivers/wifi/COMPONENT_WHD/resources/nvram/TARGET_CY8CKIT_062S2_4343W/wifi_nvram_image.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/nvram/TARGET_CY8CKIT_062S2_4343W/wifi_nvram_image.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/nvram/TARGET_CY8CKIT_062S2_4343W/wifi_nvram_image.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/nvram/TARGET_CY8CKIT_062_4343W/wifi_nvram_image.h b/connectivity/drivers/wifi/COMPONENT_WHD/resources/nvram/TARGET_CY8CKIT_062_4343W/wifi_nvram_image.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/nvram/TARGET_CY8CKIT_062_4343W/wifi_nvram_image.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/nvram/TARGET_CY8CKIT_062_4343W/wifi_nvram_image.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/nvram/TARGET_CY8CKIT_062_WIFI_BT/wifi_nvram_image.h b/connectivity/drivers/wifi/COMPONENT_WHD/resources/nvram/TARGET_CY8CKIT_062_WIFI_BT/wifi_nvram_image.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/nvram/TARGET_CY8CKIT_062_WIFI_BT/wifi_nvram_image.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/nvram/TARGET_CY8CKIT_062_WIFI_BT/wifi_nvram_image.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/nvram/TARGET_CY8CKIT_064B0S2_4343W/wifi_nvram_image.h b/connectivity/drivers/wifi/COMPONENT_WHD/resources/nvram/TARGET_CY8CKIT_064B0S2_4343W/wifi_nvram_image.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/nvram/TARGET_CY8CKIT_064B0S2_4343W/wifi_nvram_image.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/nvram/TARGET_CY8CKIT_064B0S2_4343W/wifi_nvram_image.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/nvram/TARGET_CY8CKIT_064S0S2_4343W/wifi_nvram_image.h b/connectivity/drivers/wifi/COMPONENT_WHD/resources/nvram/TARGET_CY8CKIT_064S0S2_4343W/wifi_nvram_image.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/nvram/TARGET_CY8CKIT_064S0S2_4343W/wifi_nvram_image.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/nvram/TARGET_CY8CKIT_064S0S2_4343W/wifi_nvram_image.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/nvram/TARGET_CY8CKIT_064S1_4343W/wifi_nvram_image.h b/connectivity/drivers/wifi/COMPONENT_WHD/resources/nvram/TARGET_CY8CKIT_064S1_4343W/wifi_nvram_image.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/nvram/TARGET_CY8CKIT_064S1_4343W/wifi_nvram_image.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/nvram/TARGET_CY8CKIT_064S1_4343W/wifi_nvram_image.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/nvram/TARGET_CY8CKIT_064S2_4343W/wifi_nvram_image.h b/connectivity/drivers/wifi/COMPONENT_WHD/resources/nvram/TARGET_CY8CKIT_064S2_4343W/wifi_nvram_image.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/nvram/TARGET_CY8CKIT_064S2_4343W/wifi_nvram_image.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/nvram/TARGET_CY8CKIT_064S2_4343W/wifi_nvram_image.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/nvram/TARGET_CY8CMOD_062S2_43012/wifi_nvram_image.h b/connectivity/drivers/wifi/COMPONENT_WHD/resources/nvram/TARGET_CY8CMOD_062S2_43012/wifi_nvram_image.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/nvram/TARGET_CY8CMOD_062S2_43012/wifi_nvram_image.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/nvram/TARGET_CY8CMOD_062S2_43012/wifi_nvram_image.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/nvram/TARGET_CY8CMOD_062S3_4343W/wifi_nvram_image.h b/connectivity/drivers/wifi/COMPONENT_WHD/resources/nvram/TARGET_CY8CMOD_062S3_4343W/wifi_nvram_image.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/nvram/TARGET_CY8CMOD_062S3_4343W/wifi_nvram_image.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/nvram/TARGET_CY8CMOD_062S3_4343W/wifi_nvram_image.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/nvram/TARGET_CY8CMOD_062_4343W/wifi_nvram_image.h b/connectivity/drivers/wifi/COMPONENT_WHD/resources/nvram/TARGET_CY8CMOD_062_4343W/wifi_nvram_image.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/nvram/TARGET_CY8CMOD_062_4343W/wifi_nvram_image.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/nvram/TARGET_CY8CMOD_062_4343W/wifi_nvram_image.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/nvram/TARGET_CY8CPROTO_062S3_4343W/wifi_nvram_image.h b/connectivity/drivers/wifi/COMPONENT_WHD/resources/nvram/TARGET_CY8CPROTO_062S3_4343W/wifi_nvram_image.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/nvram/TARGET_CY8CPROTO_062S3_4343W/wifi_nvram_image.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/nvram/TARGET_CY8CPROTO_062S3_4343W/wifi_nvram_image.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/nvram/TARGET_CY8CPROTO_062_4343W/wifi_nvram_image.h b/connectivity/drivers/wifi/COMPONENT_WHD/resources/nvram/TARGET_CY8CPROTO_062_4343W/wifi_nvram_image.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/nvram/TARGET_CY8CPROTO_062_4343W/wifi_nvram_image.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/nvram/TARGET_CY8CPROTO_062_4343W/wifi_nvram_image.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/nvram/TARGET_CYTFM_064B0S2_4343W/wifi_nvram_image.h b/connectivity/drivers/wifi/COMPONENT_WHD/resources/nvram/TARGET_CYTFM_064B0S2_4343W/wifi_nvram_image.h
old mode 100755
new mode 100644
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/nvram/TARGET_CYTFM_064B0S2_4343W/wifi_nvram_image.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/nvram/TARGET_CYTFM_064B0S2_4343W/wifi_nvram_image.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/nvram/TARGET_CYW943012P6EVB_01/wifi_nvram_image.h b/connectivity/drivers/wifi/COMPONENT_WHD/resources/nvram/TARGET_CYW943012P6EVB_01/wifi_nvram_image.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/nvram/TARGET_CYW943012P6EVB_01/wifi_nvram_image.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/nvram/TARGET_CYW943012P6EVB_01/wifi_nvram_image.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/nvram/TARGET_CYW943012WCD2/wifi_nvram_image.h b/connectivity/drivers/wifi/COMPONENT_WHD/resources/nvram/TARGET_CYW943012WCD2/wifi_nvram_image.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/nvram/TARGET_CYW943012WCD2/wifi_nvram_image.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/nvram/TARGET_CYW943012WCD2/wifi_nvram_image.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/nvram/TARGET_CYW9P62S1_43012CAR_01/wifi_nvram_image.h b/connectivity/drivers/wifi/COMPONENT_WHD/resources/nvram/TARGET_CYW9P62S1_43012CAR_01/wifi_nvram_image.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/nvram/TARGET_CYW9P62S1_43012CAR_01/wifi_nvram_image.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/nvram/TARGET_CYW9P62S1_43012CAR_01/wifi_nvram_image.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/nvram/TARGET_CYW9P62S1_43012EVB_01/wifi_nvram_image.h b/connectivity/drivers/wifi/COMPONENT_WHD/resources/nvram/TARGET_CYW9P62S1_43012EVB_01/wifi_nvram_image.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/nvram/TARGET_CYW9P62S1_43012EVB_01/wifi_nvram_image.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/nvram/TARGET_CYW9P62S1_43012EVB_01/wifi_nvram_image.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/nvram/TARGET_CYW9P62S1_43438EVB_01/wifi_nvram_image.h b/connectivity/drivers/wifi/COMPONENT_WHD/resources/nvram/TARGET_CYW9P62S1_43438EVB_01/wifi_nvram_image.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/nvram/TARGET_CYW9P62S1_43438EVB_01/wifi_nvram_image.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/nvram/TARGET_CYW9P62S1_43438EVB_01/wifi_nvram_image.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/nvram/TARGET_CYW9P62S2_M2BASE_4373/wifi_nvram_image.h b/connectivity/drivers/wifi/COMPONENT_WHD/resources/nvram/TARGET_CYW9P62S2_M2BASE_4373/wifi_nvram_image.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/nvram/TARGET_CYW9P62S2_M2BASE_4373/wifi_nvram_image.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/nvram/TARGET_CYW9P62S2_M2BASE_4373/wifi_nvram_image.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/resource_imp/whd_resources.c b/connectivity/drivers/wifi/COMPONENT_WHD/resources/resource_imp/whd_resources.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/resource_imp/whd_resources.c
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/resource_imp/whd_resources.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/resource_imp/wiced_resource.h b/connectivity/drivers/wifi/COMPONENT_WHD/resources/resource_imp/wiced_resource.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/resources/resource_imp/wiced_resource.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/resources/resource_imp/wiced_resource.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/bus_protocols/whd_bus.c b/connectivity/drivers/wifi/COMPONENT_WHD/src/bus_protocols/whd_bus.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/bus_protocols/whd_bus.c
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/bus_protocols/whd_bus.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/bus_protocols/whd_bus.h b/connectivity/drivers/wifi/COMPONENT_WHD/src/bus_protocols/whd_bus.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/bus_protocols/whd_bus.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/bus_protocols/whd_bus.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/bus_protocols/whd_bus_common.c b/connectivity/drivers/wifi/COMPONENT_WHD/src/bus_protocols/whd_bus_common.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/bus_protocols/whd_bus_common.c
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/bus_protocols/whd_bus_common.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/bus_protocols/whd_bus_common.h b/connectivity/drivers/wifi/COMPONENT_WHD/src/bus_protocols/whd_bus_common.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/bus_protocols/whd_bus_common.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/bus_protocols/whd_bus_common.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/bus_protocols/whd_bus_protocol_interface.h b/connectivity/drivers/wifi/COMPONENT_WHD/src/bus_protocols/whd_bus_protocol_interface.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/bus_protocols/whd_bus_protocol_interface.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/bus_protocols/whd_bus_protocol_interface.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/bus_protocols/whd_bus_sdio_protocol.c b/connectivity/drivers/wifi/COMPONENT_WHD/src/bus_protocols/whd_bus_sdio_protocol.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/bus_protocols/whd_bus_sdio_protocol.c
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/bus_protocols/whd_bus_sdio_protocol.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/bus_protocols/whd_bus_sdio_protocol.h b/connectivity/drivers/wifi/COMPONENT_WHD/src/bus_protocols/whd_bus_sdio_protocol.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/bus_protocols/whd_bus_sdio_protocol.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/bus_protocols/whd_bus_sdio_protocol.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/bus_protocols/whd_bus_spi_protocol.c b/connectivity/drivers/wifi/COMPONENT_WHD/src/bus_protocols/whd_bus_spi_protocol.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/bus_protocols/whd_bus_spi_protocol.c
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/bus_protocols/whd_bus_spi_protocol.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/bus_protocols/whd_bus_spi_protocol.h b/connectivity/drivers/wifi/COMPONENT_WHD/src/bus_protocols/whd_bus_spi_protocol.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/bus_protocols/whd_bus_spi_protocol.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/bus_protocols/whd_bus_spi_protocol.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/bus_protocols/whd_chip_reg.h b/connectivity/drivers/wifi/COMPONENT_WHD/src/bus_protocols/whd_chip_reg.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/bus_protocols/whd_chip_reg.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/bus_protocols/whd_chip_reg.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/bus_protocols/whd_sdio.h b/connectivity/drivers/wifi/COMPONENT_WHD/src/bus_protocols/whd_sdio.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/bus_protocols/whd_sdio.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/bus_protocols/whd_sdio.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/bus_protocols/whd_spi.h b/connectivity/drivers/wifi/COMPONENT_WHD/src/bus_protocols/whd_spi.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/bus_protocols/whd_spi.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/bus_protocols/whd_spi.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_ap.h b/connectivity/drivers/wifi/COMPONENT_WHD/src/include/whd_ap.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_ap.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/include/whd_ap.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_buffer_api.h b/connectivity/drivers/wifi/COMPONENT_WHD/src/include/whd_buffer_api.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_buffer_api.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/include/whd_buffer_api.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_cdc_bdc.h b/connectivity/drivers/wifi/COMPONENT_WHD/src/include/whd_cdc_bdc.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_cdc_bdc.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/include/whd_cdc_bdc.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_chip.h b/connectivity/drivers/wifi/COMPONENT_WHD/src/include/whd_chip.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_chip.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/include/whd_chip.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_chip_constants.h b/connectivity/drivers/wifi/COMPONENT_WHD/src/include/whd_chip_constants.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_chip_constants.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/include/whd_chip_constants.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_clm.h b/connectivity/drivers/wifi/COMPONENT_WHD/src/include/whd_clm.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_clm.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/include/whd_clm.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_debug.h b/connectivity/drivers/wifi/COMPONENT_WHD/src/include/whd_debug.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_debug.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/include/whd_debug.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_endian.h b/connectivity/drivers/wifi/COMPONENT_WHD/src/include/whd_endian.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_endian.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/include/whd_endian.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_events_int.h b/connectivity/drivers/wifi/COMPONENT_WHD/src/include/whd_events_int.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_events_int.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/include/whd_events_int.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_int.h b/connectivity/drivers/wifi/COMPONENT_WHD/src/include/whd_int.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_int.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/include/whd_int.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_network_if.h b/connectivity/drivers/wifi/COMPONENT_WHD/src/include/whd_network_if.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_network_if.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/include/whd_network_if.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_poll.h b/connectivity/drivers/wifi/COMPONENT_WHD/src/include/whd_poll.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_poll.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/include/whd_poll.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_resource_if.h b/connectivity/drivers/wifi/COMPONENT_WHD/src/include/whd_resource_if.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_resource_if.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/include/whd_resource_if.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_sdpcm.h b/connectivity/drivers/wifi/COMPONENT_WHD/src/include/whd_sdpcm.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_sdpcm.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/include/whd_sdpcm.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_thread.h b/connectivity/drivers/wifi/COMPONENT_WHD/src/include/whd_thread.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_thread.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/include/whd_thread.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_thread_internal.h b/connectivity/drivers/wifi/COMPONENT_WHD/src/include/whd_thread_internal.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_thread_internal.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/include/whd_thread_internal.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_types_int.h b/connectivity/drivers/wifi/COMPONENT_WHD/src/include/whd_types_int.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_types_int.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/include/whd_types_int.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_utils.h b/connectivity/drivers/wifi/COMPONENT_WHD/src/include/whd_utils.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_utils.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/include/whd_utils.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_wifi_p2p.h b/connectivity/drivers/wifi/COMPONENT_WHD/src/include/whd_wifi_p2p.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_wifi_p2p.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/include/whd_wifi_p2p.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_wlioctl.h b/connectivity/drivers/wifi/COMPONENT_WHD/src/include/whd_wlioctl.h
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/include/whd_wlioctl.h
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/include/whd_wlioctl.h
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/whd_ap.c b/connectivity/drivers/wifi/COMPONENT_WHD/src/whd_ap.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/whd_ap.c
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/whd_ap.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/whd_buffer_api.c b/connectivity/drivers/wifi/COMPONENT_WHD/src/whd_buffer_api.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/whd_buffer_api.c
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/whd_buffer_api.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/whd_cdc_bdc.c b/connectivity/drivers/wifi/COMPONENT_WHD/src/whd_cdc_bdc.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/whd_cdc_bdc.c
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/whd_cdc_bdc.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/whd_chip.c b/connectivity/drivers/wifi/COMPONENT_WHD/src/whd_chip.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/whd_chip.c
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/whd_chip.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/whd_chip_constants.c b/connectivity/drivers/wifi/COMPONENT_WHD/src/whd_chip_constants.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/whd_chip_constants.c
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/whd_chip_constants.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/whd_clm.c b/connectivity/drivers/wifi/COMPONENT_WHD/src/whd_clm.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/whd_clm.c
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/whd_clm.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/whd_debug.c b/connectivity/drivers/wifi/COMPONENT_WHD/src/whd_debug.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/whd_debug.c
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/whd_debug.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/whd_events.c b/connectivity/drivers/wifi/COMPONENT_WHD/src/whd_events.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/whd_events.c
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/whd_events.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/whd_logging.c b/connectivity/drivers/wifi/COMPONENT_WHD/src/whd_logging.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/whd_logging.c
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/whd_logging.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/whd_management.c b/connectivity/drivers/wifi/COMPONENT_WHD/src/whd_management.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/whd_management.c
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/whd_management.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/whd_network_if.c b/connectivity/drivers/wifi/COMPONENT_WHD/src/whd_network_if.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/whd_network_if.c
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/whd_network_if.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/whd_resource_if.c b/connectivity/drivers/wifi/COMPONENT_WHD/src/whd_resource_if.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/whd_resource_if.c
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/whd_resource_if.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/whd_sdpcm.c b/connectivity/drivers/wifi/COMPONENT_WHD/src/whd_sdpcm.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/whd_sdpcm.c
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/whd_sdpcm.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/whd_thread.c b/connectivity/drivers/wifi/COMPONENT_WHD/src/whd_thread.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/whd_thread.c
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/whd_thread.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/whd_utils.c b/connectivity/drivers/wifi/COMPONENT_WHD/src/whd_utils.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/whd_utils.c
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/whd_utils.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/whd_wifi.c b/connectivity/drivers/wifi/COMPONENT_WHD/src/whd_wifi.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/whd_wifi.c
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/whd_wifi.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/whd_wifi_api.c b/connectivity/drivers/wifi/COMPONENT_WHD/src/whd_wifi_api.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/whd_wifi_api.c
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/whd_wifi_api.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/whd_wifi_p2p.c b/connectivity/drivers/wifi/COMPONENT_WHD/src/whd_wifi_p2p.c
similarity index 100%
rename from targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD/src/whd_wifi_p2p.c
rename to connectivity/drivers/wifi/COMPONENT_WHD/src/whd_wifi_p2p.c
diff --git a/targets/TARGET_Cypress/TARGET_PSOC6/CMakeLists.txt b/targets/TARGET_Cypress/TARGET_PSOC6/CMakeLists.txt
index 7fe1b4c5f08..42d0566a8d6 100644
--- a/targets/TARGET_Cypress/TARGET_PSOC6/CMakeLists.txt
+++ b/targets/TARGET_Cypress/TARGET_PSOC6/CMakeLists.txt
@@ -2,8 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 add_subdirectory(COMPONENT_SCL EXCLUDE_FROM_ALL)
-add_subdirectory(COMPONENT_WHD EXCLUDE_FROM_ALL)
-add_subdirectory(common/COMPONENT_WHD EXCLUDE_FROM_ALL)
 
 add_library(mbed-cat1a INTERFACE)