diff --git a/demos/pkcs11/pkcs11_demo_management_and_rng/CMakeLists.txt b/demos/pkcs11/pkcs11_demo_management_and_rng/CMakeLists.txt
index 00626e3971..e3da742038 100644
--- a/demos/pkcs11/pkcs11_demo_management_and_rng/CMakeLists.txt
+++ b/demos/pkcs11/pkcs11_demo_management_and_rng/CMakeLists.txt
@@ -2,7 +2,7 @@ set( DEMO_NAME "pkcs11_demo_management_and_rng" )
 
 # Set path to corePKCS11 and it's third party libraries.
 set(COREPKCS11_LOCATION "${CMAKE_SOURCE_DIR}/libraries/standard/corePKCS11")
-set(CORE_PKCS11_3RDPARTY_LOCATION "${COREPKCS11_LOCATION}/3rdparty")
+set(CORE_PKCS11_3RDPARTY_LOCATION "${COREPKCS11_LOCATION}/source/dependency/3rdparty")
 
 # Include PKCS #11 library's source and header path variables.
 include( ${COREPKCS11_LOCATION}/pkcsFilePaths.cmake )
diff --git a/demos/pkcs11/pkcs11_demo_mechanisms_and_digests/CMakeLists.txt b/demos/pkcs11/pkcs11_demo_mechanisms_and_digests/CMakeLists.txt
index 16749a1fc5..1dd2b5cb4a 100644
--- a/demos/pkcs11/pkcs11_demo_mechanisms_and_digests/CMakeLists.txt
+++ b/demos/pkcs11/pkcs11_demo_mechanisms_and_digests/CMakeLists.txt
@@ -2,7 +2,7 @@ set( DEMO_NAME "pkcs11_demo_mechanisms_and_digests" )
 
 # Set path to corePKCS11 and its third party libraries.
 set(COREPKCS11_LOCATION "${CMAKE_SOURCE_DIR}/libraries/standard/corePKCS11")
-set(CORE_PKCS11_3RDPARTY_LOCATION "${COREPKCS11_LOCATION}/3rdparty")
+set(CORE_PKCS11_3RDPARTY_LOCATION "${COREPKCS11_LOCATION}/source/dependency/3rdparty")
 
 # Include PKCS #11 library's source and header path variables.
 include( ${COREPKCS11_LOCATION}/pkcsFilePaths.cmake )
diff --git a/demos/pkcs11/pkcs11_demo_objects/CMakeLists.txt b/demos/pkcs11/pkcs11_demo_objects/CMakeLists.txt
index 2de6074015..001f9a1ba8 100644
--- a/demos/pkcs11/pkcs11_demo_objects/CMakeLists.txt
+++ b/demos/pkcs11/pkcs11_demo_objects/CMakeLists.txt
@@ -2,8 +2,8 @@ set( DEMO_NAME "pkcs11_demo_objects" )
 
 # Set path to corePKCS11 and it's third party libraries.
 set(COREPKCS11_LOCATION "${CMAKE_SOURCE_DIR}/libraries/standard/corePKCS11")
-set(3RDPARTY_LOCATION "${CMAKE_SOURCE_DIR}/libraries/3rdparty")
-set(CORE_PKCS11_3RDPARTY_LOCATION "${COREPKCS11_LOCATION}/3rdparty")
+set(3RDPARTY_LOCATION "${CMAKE_SOURCE_DIR}/libraries/source/dependency/3rdparty")
+set(CORE_PKCS11_3RDPARTY_LOCATION "${COREPKCS11_LOCATION}/source/dependency/3rdparty")
 
 # Include PKCS #11 library's source and header path variables.
 include( ${COREPKCS11_LOCATION}/pkcsFilePaths.cmake )
diff --git a/demos/pkcs11/pkcs11_demo_objects/pkcs11_demo_objects.c b/demos/pkcs11/pkcs11_demo_objects/pkcs11_demo_objects.c
index 67d082ffe7..4f09c04c3e 100644
--- a/demos/pkcs11/pkcs11_demo_objects/pkcs11_demo_objects.c
+++ b/demos/pkcs11/pkcs11_demo_objects/pkcs11_demo_objects.c
@@ -91,7 +91,7 @@
     "-----END CERTIFICATE-----"
 
 /* This function can be found in
- * corePKCS11/3rdparty/mbedtls_utils/mbedtls_utils.c.
+ * corePKCS11/source/dependency/3rdparty/mbedtls_utils/mbedtls_utils.c.
  * It will be used to convert the RSA certificate from PEM format
  * to DER format. */
 extern int convert_pem_to_der( const unsigned char * pucInput,
diff --git a/demos/pkcs11/pkcs11_demo_sign_and_verify/CMakeLists.txt b/demos/pkcs11/pkcs11_demo_sign_and_verify/CMakeLists.txt
index 4240613db6..6ffbc790cb 100644
--- a/demos/pkcs11/pkcs11_demo_sign_and_verify/CMakeLists.txt
+++ b/demos/pkcs11/pkcs11_demo_sign_and_verify/CMakeLists.txt
@@ -2,8 +2,8 @@ set( DEMO_NAME "pkcs11_demo_sign_and_verify" )
 
 # Set path to corePKCS11 and it's third party libraries.
 set(COREPKCS11_LOCATION "${CMAKE_SOURCE_DIR}/libraries/standard/corePKCS11")
-set(3RDPARTY_LOCATION "${CMAKE_SOURCE_DIR}/libraries/3rdparty")
-set(CORE_PKCS11_3RDPARTY_LOCATION "${COREPKCS11_LOCATION}/3rdparty")
+set(3RDPARTY_LOCATION "${CMAKE_SOURCE_DIR}/libraries/source/dependency/3rdparty")
+set(CORE_PKCS11_3RDPARTY_LOCATION "${COREPKCS11_LOCATION}/source/dependency/3rdparty")
 
 # Include PKCS #11 library's source and header path variables.
 include( ${COREPKCS11_LOCATION}/pkcsFilePaths.cmake )
diff --git a/integration-test/pkcs11/CMakeLists.txt b/integration-test/pkcs11/CMakeLists.txt
index f7f36fedbb..888224c37e 100644
--- a/integration-test/pkcs11/CMakeLists.txt
+++ b/integration-test/pkcs11/CMakeLists.txt
@@ -12,7 +12,7 @@ set(project_name "pkcs11_system")
 # list the files you would like to test here
 set(real_source_files "${PKCS_SOURCES}")
 set(corePKCS11_location "${CMAKE_SOURCE_DIR}/libraries/standard/corePKCS11")
-set(CORE_PKCS11_3RDPARTY_LOCATION "${corePKCS11_location}/3rdparty")
+set(CORE_PKCS11_3RDPARTY_LOCATION "${corePKCS11_location}/source/dependency/3rdparty")
 set(test_config "test-config")
 
 file(GLOB MBEDTLS_FILES CONFIGURE_DEPENDS "${CORE_PKCS11_3RDPARTY_LOCATION}/mbedtls/library/*.c")
@@ -22,7 +22,8 @@ list(APPEND real_source_files
             ${MBEDTLS_FILES}
             ${test_config_sources}
             "${corePKCS11_location}/source/portable/posix/core_pkcs11_pal.c"
-            "${corePKCS11_location}/3rdparty/mbedtls_utils/mbedtls_utils.c"
+            "${CORE_PKCS11_3RDPARTY_LOCATION}/mbedtls_utils/mbedtls_utils.c"
+            "${CORE_PKCS11_3RDPARTY_LOCATION}/mbedtls_utils/mbedtls_error.c"
             )
 
 # list the directories the module under test includes
@@ -33,7 +34,7 @@ list(APPEND real_include_directories
             ${LOGGING_INCLUDE_DIRS}
             "${CORE_PKCS11_3RDPARTY_LOCATION}/pkcs11"
             "${CORE_PKCS11_3RDPARTY_LOCATION}/mbedtls/include"
-            "${corePKCS11_location}/3rdparty/mbedtls_utils"
+            "${CORE_PKCS11_3RDPARTY_LOCATION}/mbedtls_utils"
         )
 
 # =====================  Create UnitTest Code here (edit)  =====================
@@ -86,7 +87,13 @@ set_source_files_properties(
 )
 
 set_source_files_properties(
-    "${corePKCS11_location}/3rdparty/mbedtls_utils/mbedtls_utils.c"
+    "${CORE_PKCS11_3RDPARTY_LOCATION}/mbedtls_utils/mbedtls_utils.c"
+    PROPERTIES COMPILE_FLAGS
+    "-Wno-pedantic -Wno-error"
+)
+
+set_source_files_properties(
+    "${CORE_PKCS11_3RDPARTY_LOCATION}/mbedtls_utils/mbedtls_error.c"
     PROPERTIES COMPILE_FLAGS
     "-Wno-pedantic -Wno-error"
 )
diff --git a/integration-test/pkcs11/test-config/core_pkcs11_config.h b/integration-test/pkcs11/test-config/core_pkcs11_config.h
index 9a726743e7..62d3bc382f 100644
--- a/integration-test/pkcs11/test-config/core_pkcs11_config.h
+++ b/integration-test/pkcs11/test-config/core_pkcs11_config.h
@@ -51,7 +51,7 @@
 #endif
 
 #ifndef LIBRARY_LOG_LEVEL
-    #define LIBRARY_LOG_LEVEL    LOG_NONE /* PKCS #11 MBT tests will generate a lot of logs and causes parsing errors, that is why this is defaulted to NONE. */
+    #define LIBRARY_LOG_LEVEL    LOG_NONE 
 #endif
 
 #include "logging_stack.h"
diff --git a/libraries/standard/corePKCS11 b/libraries/standard/corePKCS11
index 8e41830bf0..3a65d76a06 160000
--- a/libraries/standard/corePKCS11
+++ b/libraries/standard/corePKCS11
@@ -1 +1 @@
-Subproject commit 8e41830bf07572f4cc7b6077d27380c65db76e2a
+Subproject commit 3a65d76a065c8e3d5c2de87f7a3adf9f174f6d1d