diff --git a/connectivity/mbedtls/targets/TARGET_Cypress/TARGET_MXCRYPTO/TARGET_MXCRYPTO_01/sha1_alt.h b/connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/TARGET_MXCRYPTO_01/sha1_alt.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_Cypress/TARGET_MXCRYPTO/TARGET_MXCRYPTO_01/sha1_alt.h
rename to connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/TARGET_MXCRYPTO_01/sha1_alt.h
diff --git a/connectivity/mbedtls/targets/TARGET_Cypress/TARGET_MXCRYPTO/TARGET_MXCRYPTO_01/sha256_alt.h b/connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/TARGET_MXCRYPTO_01/sha256_alt.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_Cypress/TARGET_MXCRYPTO/TARGET_MXCRYPTO_01/sha256_alt.h
rename to connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/TARGET_MXCRYPTO_01/sha256_alt.h
diff --git a/connectivity/mbedtls/targets/TARGET_Cypress/TARGET_MXCRYPTO/TARGET_MXCRYPTO_01/sha512_alt.h b/connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/TARGET_MXCRYPTO_01/sha512_alt.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_Cypress/TARGET_MXCRYPTO/TARGET_MXCRYPTO_01/sha512_alt.h
rename to connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/TARGET_MXCRYPTO_01/sha512_alt.h
diff --git a/connectivity/mbedtls/targets/TARGET_Cypress/TARGET_MXCRYPTO/TARGET_MXCRYPTO_02/sha1_alt.h b/connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/TARGET_MXCRYPTO_02/sha1_alt.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_Cypress/TARGET_MXCRYPTO/TARGET_MXCRYPTO_02/sha1_alt.h
rename to connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/TARGET_MXCRYPTO_02/sha1_alt.h
diff --git a/connectivity/mbedtls/targets/TARGET_Cypress/TARGET_MXCRYPTO/TARGET_MXCRYPTO_02/sha256_alt.h b/connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/TARGET_MXCRYPTO_02/sha256_alt.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_Cypress/TARGET_MXCRYPTO/TARGET_MXCRYPTO_02/sha256_alt.h
rename to connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/TARGET_MXCRYPTO_02/sha256_alt.h
diff --git a/connectivity/mbedtls/targets/TARGET_Cypress/TARGET_MXCRYPTO/TARGET_MXCRYPTO_02/sha512_alt.h b/connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/TARGET_MXCRYPTO_02/sha512_alt.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_Cypress/TARGET_MXCRYPTO/TARGET_MXCRYPTO_02/sha512_alt.h
rename to connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/TARGET_MXCRYPTO_02/sha512_alt.h
diff --git a/connectivity/mbedtls/targets/TARGET_Cypress/TARGET_MXCRYPTO/aes_alt.c b/connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/aes_alt.c
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_Cypress/TARGET_MXCRYPTO/aes_alt.c
rename to connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/aes_alt.c
diff --git a/connectivity/mbedtls/targets/TARGET_Cypress/TARGET_MXCRYPTO/aes_alt.h b/connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/aes_alt.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_Cypress/TARGET_MXCRYPTO/aes_alt.h
rename to connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/aes_alt.h
diff --git a/connectivity/mbedtls/targets/TARGET_Cypress/TARGET_MXCRYPTO/crypto_common.c b/connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/crypto_common.c
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_Cypress/TARGET_MXCRYPTO/crypto_common.c
rename to connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/crypto_common.c
diff --git a/connectivity/mbedtls/targets/TARGET_Cypress/TARGET_MXCRYPTO/crypto_common.h b/connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/crypto_common.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_Cypress/TARGET_MXCRYPTO/crypto_common.h
rename to connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/crypto_common.h
diff --git a/connectivity/mbedtls/targets/TARGET_Cypress/TARGET_MXCRYPTO/ecdsa_alt.c b/connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/ecdsa_alt.c
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_Cypress/TARGET_MXCRYPTO/ecdsa_alt.c
rename to connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/ecdsa_alt.c
diff --git a/connectivity/mbedtls/targets/TARGET_Cypress/TARGET_MXCRYPTO/ecp_alt.c b/connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/ecp_alt.c
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_Cypress/TARGET_MXCRYPTO/ecp_alt.c
rename to connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/ecp_alt.c
diff --git a/connectivity/mbedtls/targets/TARGET_Cypress/TARGET_MXCRYPTO/ecp_alt.h b/connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/ecp_alt.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_Cypress/TARGET_MXCRYPTO/ecp_alt.h
rename to connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/ecp_alt.h
diff --git a/connectivity/mbedtls/targets/TARGET_Cypress/TARGET_MXCRYPTO/ecp_curves_alt.c b/connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/ecp_curves_alt.c
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_Cypress/TARGET_MXCRYPTO/ecp_curves_alt.c
rename to connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/ecp_curves_alt.c
diff --git a/connectivity/mbedtls/targets/TARGET_Cypress/TARGET_MXCRYPTO/mbedtls_device.h b/connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/mbedtls_device.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_Cypress/TARGET_MXCRYPTO/mbedtls_device.h
rename to connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/mbedtls_device.h
diff --git a/connectivity/mbedtls/targets/TARGET_Cypress/TARGET_MXCRYPTO/sha1_alt.c b/connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/sha1_alt.c
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_Cypress/TARGET_MXCRYPTO/sha1_alt.c
rename to connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/sha1_alt.c
diff --git a/connectivity/mbedtls/targets/TARGET_Cypress/TARGET_MXCRYPTO/sha256_alt.c b/connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/sha256_alt.c
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_Cypress/TARGET_MXCRYPTO/sha256_alt.c
rename to connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/sha256_alt.c
diff --git a/connectivity/mbedtls/targets/TARGET_Cypress/TARGET_MXCRYPTO/sha512_alt.c b/connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/sha512_alt.c
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_Cypress/TARGET_MXCRYPTO/sha512_alt.c
rename to connectivity/drivers/mbedtls/TARGET_Cypress/TARGET_MXCRYPTO/sha512_alt.c
diff --git a/connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/aes/aes_alt.c b/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/aes/aes_alt.c
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/aes/aes_alt.c
rename to connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/aes/aes_alt.c
diff --git a/connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/aes/aes_alt.h b/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/aes/aes_alt.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/aes/aes_alt.h
rename to connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/aes/aes_alt.h
diff --git a/connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/des/des_alt.c b/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/des/des_alt.c
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/des/des_alt.c
rename to connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/des/des_alt.c
diff --git a/connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/des/des_alt.h b/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/des/des_alt.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/des/des_alt.h
rename to connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/des/des_alt.h
diff --git a/connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/ecp/ecp_internal_alt.c b/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/ecp/ecp_internal_alt.c
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/ecp/ecp_internal_alt.c
rename to connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/ecp/ecp_internal_alt.c
diff --git a/connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/mbedtls_device.h b/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/mbedtls_device.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/mbedtls_device.h
rename to connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/mbedtls_device.h
diff --git a/connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/sha/sha1_alt.c b/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/sha/sha1_alt.c
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/sha/sha1_alt.c
rename to connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/sha/sha1_alt.c
diff --git a/connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/sha/sha1_alt.h b/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/sha/sha1_alt.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/sha/sha1_alt.h
rename to connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/sha/sha1_alt.h
diff --git a/connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/sha/sha1_alt_sw.c b/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/sha/sha1_alt_sw.c
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/sha/sha1_alt_sw.c
rename to connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/sha/sha1_alt_sw.c
diff --git a/connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/sha/sha1_alt_sw.h b/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/sha/sha1_alt_sw.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/sha/sha1_alt_sw.h
rename to connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/sha/sha1_alt_sw.h
diff --git a/connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/sha/sha256_alt.c b/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/sha/sha256_alt.c
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/sha/sha256_alt.c
rename to connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/sha/sha256_alt.c
diff --git a/connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/sha/sha256_alt.h b/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/sha/sha256_alt.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/sha/sha256_alt.h
rename to connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/sha/sha256_alt.h
diff --git a/connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/sha/sha256_alt_sw.c b/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/sha/sha256_alt_sw.c
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/sha/sha256_alt_sw.c
rename to connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/sha/sha256_alt_sw.c
diff --git a/connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/sha/sha256_alt_sw.h b/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/sha/sha256_alt_sw.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/sha/sha256_alt_sw.h
rename to connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/sha/sha256_alt_sw.h
diff --git a/connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/sha/sha512_alt.c b/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/sha/sha512_alt.c
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/sha/sha512_alt.c
rename to connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/sha/sha512_alt.c
diff --git a/connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/sha/sha512_alt.h b/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/sha/sha512_alt.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/sha/sha512_alt.h
rename to connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/sha/sha512_alt.h
diff --git a/connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/sha/sha512_alt_sw.c b/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/sha/sha512_alt_sw.c
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/sha/sha512_alt_sw.c
rename to connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/sha/sha512_alt_sw.c
diff --git a/connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/sha/sha512_alt_sw.h b/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/sha/sha512_alt_sw.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/sha/sha512_alt_sw.h
rename to connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/sha/sha512_alt_sw.h
diff --git a/connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/sha/sha_alt_hw.c b/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/sha/sha_alt_hw.c
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/sha/sha_alt_hw.c
rename to connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/sha/sha_alt_hw.c
diff --git a/connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/sha/sha_alt_hw.h b/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/sha/sha_alt_hw.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/sha/sha_alt_hw.h
rename to connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/sha/sha_alt_hw.h
diff --git a/connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/TARGET_NUMAKER_PFM_NUC472/mbedtls_device.h b/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_NUC472/TARGET_NUMAKER_PFM_NUC472/mbedtls_device.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/TARGET_NUMAKER_PFM_NUC472/mbedtls_device.h
rename to connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_NUC472/TARGET_NUMAKER_PFM_NUC472/mbedtls_device.h
diff --git a/connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/aes/aes_alt.c b/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_NUC472/aes/aes_alt.c
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/aes/aes_alt.c
rename to connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_NUC472/aes/aes_alt.c
diff --git a/connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/aes/aes_alt.h b/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_NUC472/aes/aes_alt.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/aes/aes_alt.h
rename to connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_NUC472/aes/aes_alt.h
diff --git a/connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/des/des_alt.c b/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_NUC472/des/des_alt.c
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/des/des_alt.c
rename to connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_NUC472/des/des_alt.c
diff --git a/connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/des/des_alt.h b/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_NUC472/des/des_alt.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/des/des_alt.h
rename to connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_NUC472/des/des_alt.h
diff --git a/connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/sha/sha1_alt.c b/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_NUC472/sha/sha1_alt.c
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/sha/sha1_alt.c
rename to connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_NUC472/sha/sha1_alt.c
diff --git a/connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/sha/sha1_alt.h b/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_NUC472/sha/sha1_alt.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/sha/sha1_alt.h
rename to connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_NUC472/sha/sha1_alt.h
diff --git a/connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/sha/sha1_alt_sw.c b/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_NUC472/sha/sha1_alt_sw.c
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/sha/sha1_alt_sw.c
rename to connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_NUC472/sha/sha1_alt_sw.c
diff --git a/connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/sha/sha1_alt_sw.h b/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_NUC472/sha/sha1_alt_sw.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/sha/sha1_alt_sw.h
rename to connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_NUC472/sha/sha1_alt_sw.h
diff --git a/connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/sha/sha256_alt.c b/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_NUC472/sha/sha256_alt.c
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/sha/sha256_alt.c
rename to connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_NUC472/sha/sha256_alt.c
diff --git a/connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/sha/sha256_alt.h b/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_NUC472/sha/sha256_alt.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/sha/sha256_alt.h
rename to connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_NUC472/sha/sha256_alt.h
diff --git a/connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/sha/sha256_alt_sw.c b/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_NUC472/sha/sha256_alt_sw.c
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/sha/sha256_alt_sw.c
rename to connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_NUC472/sha/sha256_alt_sw.c
diff --git a/connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/sha/sha256_alt_sw.h b/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_NUC472/sha/sha256_alt_sw.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/sha/sha256_alt_sw.h
rename to connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_NUC472/sha/sha256_alt_sw.h
diff --git a/connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/sha/sha_alt_hw.c b/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_NUC472/sha/sha_alt_hw.c
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/sha/sha_alt_hw.c
rename to connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_NUC472/sha/sha_alt_hw.c
diff --git a/connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/sha/sha_alt_hw.h b/connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_NUC472/sha/sha_alt_hw.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_NUC472/sha/sha_alt_hw.h
rename to connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_NUC472/sha/sha_alt_hw.h
diff --git a/connectivity/mbedtls/targets/TARGET_STM/TARGET_STM32F437xG/mbedtls_device.h b/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32F437xG/mbedtls_device.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_STM/TARGET_STM32F437xG/mbedtls_device.h
rename to connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32F437xG/mbedtls_device.h
diff --git a/connectivity/mbedtls/targets/TARGET_STM/TARGET_STM32F439xI/mbedtls_device.h b/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32F439xI/mbedtls_device.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_STM/TARGET_STM32F439xI/mbedtls_device.h
rename to connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32F439xI/mbedtls_device.h
diff --git a/connectivity/mbedtls/targets/TARGET_STM/TARGET_STM32F756xG/mbedtls_device.h b/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32F756xG/mbedtls_device.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_STM/TARGET_STM32F756xG/mbedtls_device.h
rename to connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32F756xG/mbedtls_device.h
diff --git a/connectivity/mbedtls/targets/TARGET_STM/TARGET_STM32L443xC/mbedtls_device.h b/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32L443xC/mbedtls_device.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_STM/TARGET_STM32L443xC/mbedtls_device.h
rename to connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32L443xC/mbedtls_device.h
diff --git a/connectivity/mbedtls/targets/TARGET_STM/TARGET_STM32L486xG/mbedtls_device.h b/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32L486xG/mbedtls_device.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_STM/TARGET_STM32L486xG/mbedtls_device.h
rename to connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32L486xG/mbedtls_device.h
diff --git a/connectivity/mbedtls/targets/TARGET_STM/TARGET_STM32L562xx/mbedtls_device.h b/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32L562xx/mbedtls_device.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_STM/TARGET_STM32L562xx/mbedtls_device.h
rename to connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32L562xx/mbedtls_device.h
diff --git a/connectivity/mbedtls/targets/TARGET_STM/TARGET_STM32WB55xx/mbedtls_device.h b/connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32WB55xx/mbedtls_device.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_STM/TARGET_STM32WB55xx/mbedtls_device.h
rename to connectivity/drivers/mbedtls/TARGET_STM/TARGET_STM32WB55xx/mbedtls_device.h
diff --git a/connectivity/mbedtls/targets/TARGET_STM/aes_alt.cpp b/connectivity/drivers/mbedtls/TARGET_STM/aes_alt.cpp
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_STM/aes_alt.cpp
rename to connectivity/drivers/mbedtls/TARGET_STM/aes_alt.cpp
diff --git a/connectivity/mbedtls/targets/TARGET_STM/aes_alt.h b/connectivity/drivers/mbedtls/TARGET_STM/aes_alt.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_STM/aes_alt.h
rename to connectivity/drivers/mbedtls/TARGET_STM/aes_alt.h
diff --git a/connectivity/mbedtls/targets/TARGET_STM/aes_alt_stm32l4.c b/connectivity/drivers/mbedtls/TARGET_STM/aes_alt_stm32l4.c
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_STM/aes_alt_stm32l4.c
rename to connectivity/drivers/mbedtls/TARGET_STM/aes_alt_stm32l4.c
diff --git a/connectivity/mbedtls/targets/TARGET_STM/aes_alt_stm32l4.h b/connectivity/drivers/mbedtls/TARGET_STM/aes_alt_stm32l4.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_STM/aes_alt_stm32l4.h
rename to connectivity/drivers/mbedtls/TARGET_STM/aes_alt_stm32l4.h
diff --git a/connectivity/mbedtls/targets/TARGET_STM/ccm_alt.cpp b/connectivity/drivers/mbedtls/TARGET_STM/ccm_alt.cpp
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_STM/ccm_alt.cpp
rename to connectivity/drivers/mbedtls/TARGET_STM/ccm_alt.cpp
diff --git a/connectivity/mbedtls/targets/TARGET_STM/ccm_alt.h b/connectivity/drivers/mbedtls/TARGET_STM/ccm_alt.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_STM/ccm_alt.h
rename to connectivity/drivers/mbedtls/TARGET_STM/ccm_alt.h
diff --git a/connectivity/mbedtls/targets/TARGET_STM/cryp_stm32.c b/connectivity/drivers/mbedtls/TARGET_STM/cryp_stm32.c
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_STM/cryp_stm32.c
rename to connectivity/drivers/mbedtls/TARGET_STM/cryp_stm32.c
diff --git a/connectivity/mbedtls/targets/TARGET_STM/cryp_stm32.h b/connectivity/drivers/mbedtls/TARGET_STM/cryp_stm32.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_STM/cryp_stm32.h
rename to connectivity/drivers/mbedtls/TARGET_STM/cryp_stm32.h
diff --git a/connectivity/mbedtls/targets/TARGET_STM/gcm_alt.cpp b/connectivity/drivers/mbedtls/TARGET_STM/gcm_alt.cpp
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_STM/gcm_alt.cpp
rename to connectivity/drivers/mbedtls/TARGET_STM/gcm_alt.cpp
diff --git a/connectivity/mbedtls/targets/TARGET_STM/gcm_alt.h b/connectivity/drivers/mbedtls/TARGET_STM/gcm_alt.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_STM/gcm_alt.h
rename to connectivity/drivers/mbedtls/TARGET_STM/gcm_alt.h
diff --git a/connectivity/mbedtls/targets/TARGET_STM/hash_stm32.c b/connectivity/drivers/mbedtls/TARGET_STM/hash_stm32.c
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_STM/hash_stm32.c
rename to connectivity/drivers/mbedtls/TARGET_STM/hash_stm32.c
diff --git a/connectivity/mbedtls/targets/TARGET_STM/hash_stm32.h b/connectivity/drivers/mbedtls/TARGET_STM/hash_stm32.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_STM/hash_stm32.h
rename to connectivity/drivers/mbedtls/TARGET_STM/hash_stm32.h
diff --git a/connectivity/mbedtls/targets/TARGET_STM/md5_alt.cpp b/connectivity/drivers/mbedtls/TARGET_STM/md5_alt.cpp
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_STM/md5_alt.cpp
rename to connectivity/drivers/mbedtls/TARGET_STM/md5_alt.cpp
diff --git a/connectivity/mbedtls/targets/TARGET_STM/md5_alt.h b/connectivity/drivers/mbedtls/TARGET_STM/md5_alt.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_STM/md5_alt.h
rename to connectivity/drivers/mbedtls/TARGET_STM/md5_alt.h
diff --git a/connectivity/mbedtls/targets/TARGET_STM/sha1_alt.cpp b/connectivity/drivers/mbedtls/TARGET_STM/sha1_alt.cpp
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_STM/sha1_alt.cpp
rename to connectivity/drivers/mbedtls/TARGET_STM/sha1_alt.cpp
diff --git a/connectivity/mbedtls/targets/TARGET_STM/sha1_alt.h b/connectivity/drivers/mbedtls/TARGET_STM/sha1_alt.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_STM/sha1_alt.h
rename to connectivity/drivers/mbedtls/TARGET_STM/sha1_alt.h
diff --git a/connectivity/mbedtls/targets/TARGET_STM/sha256_alt.cpp b/connectivity/drivers/mbedtls/TARGET_STM/sha256_alt.cpp
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_STM/sha256_alt.cpp
rename to connectivity/drivers/mbedtls/TARGET_STM/sha256_alt.cpp
diff --git a/connectivity/mbedtls/targets/TARGET_STM/sha256_alt.h b/connectivity/drivers/mbedtls/TARGET_STM/sha256_alt.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_STM/sha256_alt.h
rename to connectivity/drivers/mbedtls/TARGET_STM/sha256_alt.h
diff --git a/connectivity/mbedtls/targets/TARGET_Samsung/mbedtls_device.h b/connectivity/drivers/mbedtls/TARGET_Samsung/mbedtls_device.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_Samsung/mbedtls_device.h
rename to connectivity/drivers/mbedtls/TARGET_Samsung/mbedtls_device.h
diff --git a/connectivity/mbedtls/targets/TARGET_Samsung/sha/sha256_alt.c b/connectivity/drivers/mbedtls/TARGET_Samsung/sha/sha256_alt.c
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_Samsung/sha/sha256_alt.c
rename to connectivity/drivers/mbedtls/TARGET_Samsung/sha/sha256_alt.c
diff --git a/connectivity/mbedtls/targets/TARGET_Samsung/sha/sha256_alt.h b/connectivity/drivers/mbedtls/TARGET_Samsung/sha/sha256_alt.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_Samsung/sha/sha256_alt.h
rename to connectivity/drivers/mbedtls/TARGET_Samsung/sha/sha256_alt.h
diff --git a/connectivity/mbedtls/targets/TARGET_Samsung/sha/sha512_alt.c b/connectivity/drivers/mbedtls/TARGET_Samsung/sha/sha512_alt.c
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_Samsung/sha/sha512_alt.c
rename to connectivity/drivers/mbedtls/TARGET_Samsung/sha/sha512_alt.c
diff --git a/connectivity/mbedtls/targets/TARGET_Samsung/sha/sha512_alt.h b/connectivity/drivers/mbedtls/TARGET_Samsung/sha/sha512_alt.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_Samsung/sha/sha512_alt.h
rename to connectivity/drivers/mbedtls/TARGET_Samsung/sha/sha512_alt.h
diff --git a/connectivity/mbedtls/targets/TARGET_Silicon_Labs/aes_aes.c b/connectivity/drivers/mbedtls/TARGET_Silicon_Labs/aes_aes.c
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_Silicon_Labs/aes_aes.c
rename to connectivity/drivers/mbedtls/TARGET_Silicon_Labs/aes_aes.c
diff --git a/connectivity/mbedtls/targets/TARGET_Silicon_Labs/aes_alt.h b/connectivity/drivers/mbedtls/TARGET_Silicon_Labs/aes_alt.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_Silicon_Labs/aes_alt.h
rename to connectivity/drivers/mbedtls/TARGET_Silicon_Labs/aes_alt.h
diff --git a/connectivity/mbedtls/targets/TARGET_Silicon_Labs/crypto_aes.c b/connectivity/drivers/mbedtls/TARGET_Silicon_Labs/crypto_aes.c
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_Silicon_Labs/crypto_aes.c
rename to connectivity/drivers/mbedtls/TARGET_Silicon_Labs/crypto_aes.c
diff --git a/connectivity/mbedtls/targets/TARGET_Silicon_Labs/crypto_ecp.c b/connectivity/drivers/mbedtls/TARGET_Silicon_Labs/crypto_ecp.c
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_Silicon_Labs/crypto_ecp.c
rename to connectivity/drivers/mbedtls/TARGET_Silicon_Labs/crypto_ecp.c
diff --git a/connectivity/mbedtls/targets/TARGET_Silicon_Labs/crypto_management.c b/connectivity/drivers/mbedtls/TARGET_Silicon_Labs/crypto_management.c
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_Silicon_Labs/crypto_management.c
rename to connectivity/drivers/mbedtls/TARGET_Silicon_Labs/crypto_management.c
diff --git a/connectivity/mbedtls/targets/TARGET_Silicon_Labs/crypto_management.h b/connectivity/drivers/mbedtls/TARGET_Silicon_Labs/crypto_management.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_Silicon_Labs/crypto_management.h
rename to connectivity/drivers/mbedtls/TARGET_Silicon_Labs/crypto_management.h
diff --git a/connectivity/mbedtls/targets/TARGET_Silicon_Labs/crypto_sha.c b/connectivity/drivers/mbedtls/TARGET_Silicon_Labs/crypto_sha.c
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_Silicon_Labs/crypto_sha.c
rename to connectivity/drivers/mbedtls/TARGET_Silicon_Labs/crypto_sha.c
diff --git a/connectivity/mbedtls/targets/TARGET_Silicon_Labs/mbedtls_device.h b/connectivity/drivers/mbedtls/TARGET_Silicon_Labs/mbedtls_device.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_Silicon_Labs/mbedtls_device.h
rename to connectivity/drivers/mbedtls/TARGET_Silicon_Labs/mbedtls_device.h
diff --git a/connectivity/mbedtls/targets/TARGET_Silicon_Labs/sha1_alt.h b/connectivity/drivers/mbedtls/TARGET_Silicon_Labs/sha1_alt.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_Silicon_Labs/sha1_alt.h
rename to connectivity/drivers/mbedtls/TARGET_Silicon_Labs/sha1_alt.h
diff --git a/connectivity/mbedtls/targets/TARGET_Silicon_Labs/sha256_alt.h b/connectivity/drivers/mbedtls/TARGET_Silicon_Labs/sha256_alt.h
similarity index 100%
rename from connectivity/mbedtls/targets/TARGET_Silicon_Labs/sha256_alt.h
rename to connectivity/drivers/mbedtls/TARGET_Silicon_Labs/sha256_alt.h
diff --git a/connectivity/mbedtls/targets/hash_wrappers.c b/connectivity/drivers/mbedtls/hash_wrappers.c
similarity index 100%
rename from connectivity/mbedtls/targets/hash_wrappers.c
rename to connectivity/drivers/mbedtls/hash_wrappers.c