diff --git a/UNITTESTS/CMakeLists.txt b/UNITTESTS/CMakeLists.txt
index 87863de..77e7f8f 100644
--- a/UNITTESTS/CMakeLists.txt
+++ b/UNITTESTS/CMakeLists.txt
@@ -151,8 +151,8 @@
   "${PROJECT_SOURCE_DIR}/../features/lorawan/lorastack/mac"
   "${PROJECT_SOURCE_DIR}/../features/lorawan/lorastack/phy"
   "${PROJECT_SOURCE_DIR}/../features/lorawan/system"
-  "${PROJECT_SOURCE_DIR}/../features/mbedtls"
-  "${PROJECT_SOURCE_DIR}/../features/mbedtls/inc"
+  "${PROJECT_SOURCE_DIR}/../connectivity/mbedtls"
+  "${PROJECT_SOURCE_DIR}/../connectivity/mbedtls/include"
 )
 
 # Create a list for test suites.
diff --git a/UNITTESTS/empty_baseline/unittest.cmake b/UNITTESTS/empty_baseline/unittest.cmake
index e6a4da5..88fc349 100644
--- a/UNITTESTS/empty_baseline/unittest.cmake
+++ b/UNITTESTS/empty_baseline/unittest.cmake
@@ -6,8 +6,8 @@
 set(unittest-includes ${unittest-includes}
   .
   ..
-  ../features/mbedtls/inc/mbedtls/
-  ../features/mbedtls/platform/inc/
+  ../connectivity/mbedtls/include/mbedtls/
+  ../connectivity/mbedtls/platform/inc/
   ../features/frameworks/mbed-trace/mbed-trace/
 )
 
diff --git a/connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/ecp/ecp_internal_alt.c b/connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/ecp/ecp_internal_alt.c
index 48804e5..c0c116b 100644
--- a/connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/ecp/ecp_internal_alt.c
+++ b/connectivity/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/ecp/ecp_internal_alt.c
@@ -214,7 +214,7 @@
 {
     /* Support only short Weierstrass type
      * 
-     * ECP type is checked by referring to mbed-os/features/mbedtls/src/ecp.c > ecp_get_type
+     * ECP type is checked by referring to mbed-os/connectivity/mbedtls/src/ecp.c > ecp_get_type
      */
     if (grp->G.X.p == NULL || grp->G.Y.p == NULL) {
         return 0;
diff --git a/doxyfile_options b/doxyfile_options
index 80155aa..2413231 100644
--- a/doxyfile_options
+++ b/doxyfile_options
@@ -843,7 +843,7 @@
                          */cmsis/* \
                          */connectivity/drivers/emac/* \
                          */features/cryptocell/* \
-                         */features/mbedtls/* \
+                         */connectivity/mbedtls/* \
                          */features/unsupported/* \
                          */connectivity/lwipstack/* \
                          */connectivity/nanostack/sal-stack-nanostack/* \
diff --git a/doxygen_options.json b/doxygen_options.json
index 7f6c17f..178689d 100644
--- a/doxygen_options.json
+++ b/doxygen_options.json
@@ -10,7 +10,7 @@
     "EXPAND_AS_DEFINED": "",
     "SKIP_FUNCTION_MACROS": "NO",
     "STRIP_CODE_COMMENTS": "NO",
-    "EXCLUDE_PATTERNS": "*/tools/* */targets/* */features/mbedtls/* */features/unsupported/* */BUILD/* */rtos/TARGET_CORTEX/rtx*/* */cmsis/* */features/lwipstack/* */nanostack/sal-stack-nanostack/* */nanostack/coap-service/* */ble/generic/* */ble/pal/* */mbed-trace/* */mbed-coap/* */nanostack-libservice/* */mbed-client-randlib/* */nanostack/sal-stack-nanostack-eventloop/* */connectivity/drivers/802.15.4_RF/* */components/wifi/* */features/nfc/stack/* */UNITTESTS/* */features/cryptocell/*",
+    "EXCLUDE_PATTERNS": "*/tools/* */targets/* */connectivity/mbedtls/* */features/unsupported/* */BUILD/* */rtos/TARGET_CORTEX/rtx*/* */cmsis/* */features/lwipstack/* */nanostack/sal-stack-nanostack/* */nanostack/coap-service/* */ble/generic/* */ble/pal/* */mbed-trace/* */mbed-coap/* */nanostack-libservice/* */mbed-client-randlib/* */nanostack/sal-stack-nanostack-eventloop/* */connectivity/drivers/802.15.4_RF/* */components/wifi/* */features/nfc/stack/* */UNITTESTS/* */features/cryptocell/*",
     "ALPHABETICAL_INDEX": "NO",
     "CASE_SENSE_NAMES": "NO",
     "DOT_MULTI_TARGETS": "YES",