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 100%
rename from connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/interface/CyDhcpServer.h
rename to connectivity/drivers/emac/COMPONENT_WHD/interface/CyDhcpServer.h
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 100%
rename from connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD/interface/WhdSTAInterface.cpp
rename to connectivity/drivers/emac/COMPONENT_WHD/interface/WhdSTAInterface.cpp
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