diff --git a/core/crypto/SCsub b/core/crypto/SCsub
index aaa61ff..d67b483 100644
--- a/core/crypto/SCsub
+++ b/core/crypto/SCsub
@@ -12,7 +12,7 @@ if is_builtin or not has_module:
     # Use our headers for builtin or if the module is not going to be compiled.
     # We decided not to depend on system mbedtls just for these few files that can
     # be easily extracted.
-    env_crypto.Prepend(CPPPATH=["#thirdparty/mbedtls/include"])
+    env_crypto.Prepend(CPPPATH=["#modules/mbedtls/mbedtls/include"])
 
 # MbedTLS core functions (for CryptoCore).
 # If the mbedtls module is compiled we don't need to add the .c files with our
diff --git a/modules/mbedtls/SCsub b/modules/mbedtls/SCsub
index d2a6038..230f2bd 100644
--- a/modules/mbedtls/SCsub
+++ b/modules/mbedtls/SCsub
@@ -96,10 +96,10 @@ if env["builtin_mbedtls"]:
         "xtea.c",
     ]
 
-    thirdparty_dir = "#thirdparty/mbedtls/library/"
+    thirdparty_dir = "mbedtls/library/"
     thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
 
-    env_mbed_tls.Prepend(CPPPATH=["#thirdparty/mbedtls/include/"])
+    env_mbed_tls.Prepend(CPPPATH=["mbedtls/include/"])
 
     env_thirdparty = env_mbed_tls.Clone()
     env_thirdparty.disable_warnings()
diff --git a/thirdparty/mbedtls/LICENSE b/modules/mbedtls/mbedtls/LICENSE
similarity index 100%
rename from thirdparty/mbedtls/LICENSE
rename to modules/mbedtls/mbedtls/LICENSE
diff --git a/thirdparty/mbedtls/include/godot_core_mbedtls_config.h b/modules/mbedtls/mbedtls/include/godot_core_mbedtls_config.h
similarity index 100%
rename from thirdparty/mbedtls/include/godot_core_mbedtls_config.h
rename to modules/mbedtls/mbedtls/include/godot_core_mbedtls_config.h
diff --git a/thirdparty/mbedtls/include/mbedtls/aes.h b/modules/mbedtls/mbedtls/include/mbedtls/aes.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/aes.h
rename to modules/mbedtls/mbedtls/include/mbedtls/aes.h
diff --git a/thirdparty/mbedtls/include/mbedtls/aesni.h b/modules/mbedtls/mbedtls/include/mbedtls/aesni.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/aesni.h
rename to modules/mbedtls/mbedtls/include/mbedtls/aesni.h
diff --git a/thirdparty/mbedtls/include/mbedtls/arc4.h b/modules/mbedtls/mbedtls/include/mbedtls/arc4.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/arc4.h
rename to modules/mbedtls/mbedtls/include/mbedtls/arc4.h
diff --git a/thirdparty/mbedtls/include/mbedtls/aria.h b/modules/mbedtls/mbedtls/include/mbedtls/aria.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/aria.h
rename to modules/mbedtls/mbedtls/include/mbedtls/aria.h
diff --git a/thirdparty/mbedtls/include/mbedtls/asn1.h b/modules/mbedtls/mbedtls/include/mbedtls/asn1.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/asn1.h
rename to modules/mbedtls/mbedtls/include/mbedtls/asn1.h
diff --git a/thirdparty/mbedtls/include/mbedtls/asn1write.h b/modules/mbedtls/mbedtls/include/mbedtls/asn1write.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/asn1write.h
rename to modules/mbedtls/mbedtls/include/mbedtls/asn1write.h
diff --git a/thirdparty/mbedtls/include/mbedtls/base64.h b/modules/mbedtls/mbedtls/include/mbedtls/base64.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/base64.h
rename to modules/mbedtls/mbedtls/include/mbedtls/base64.h
diff --git a/thirdparty/mbedtls/include/mbedtls/bignum.h b/modules/mbedtls/mbedtls/include/mbedtls/bignum.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/bignum.h
rename to modules/mbedtls/mbedtls/include/mbedtls/bignum.h
diff --git a/thirdparty/mbedtls/include/mbedtls/blowfish.h b/modules/mbedtls/mbedtls/include/mbedtls/blowfish.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/blowfish.h
rename to modules/mbedtls/mbedtls/include/mbedtls/blowfish.h
diff --git a/thirdparty/mbedtls/include/mbedtls/bn_mul.h b/modules/mbedtls/mbedtls/include/mbedtls/bn_mul.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/bn_mul.h
rename to modules/mbedtls/mbedtls/include/mbedtls/bn_mul.h
diff --git a/thirdparty/mbedtls/include/mbedtls/camellia.h b/modules/mbedtls/mbedtls/include/mbedtls/camellia.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/camellia.h
rename to modules/mbedtls/mbedtls/include/mbedtls/camellia.h
diff --git a/thirdparty/mbedtls/include/mbedtls/ccm.h b/modules/mbedtls/mbedtls/include/mbedtls/ccm.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/ccm.h
rename to modules/mbedtls/mbedtls/include/mbedtls/ccm.h
diff --git a/thirdparty/mbedtls/include/mbedtls/certs.h b/modules/mbedtls/mbedtls/include/mbedtls/certs.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/certs.h
rename to modules/mbedtls/mbedtls/include/mbedtls/certs.h
diff --git a/thirdparty/mbedtls/include/mbedtls/chacha20.h b/modules/mbedtls/mbedtls/include/mbedtls/chacha20.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/chacha20.h
rename to modules/mbedtls/mbedtls/include/mbedtls/chacha20.h
diff --git a/thirdparty/mbedtls/include/mbedtls/chachapoly.h b/modules/mbedtls/mbedtls/include/mbedtls/chachapoly.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/chachapoly.h
rename to modules/mbedtls/mbedtls/include/mbedtls/chachapoly.h
diff --git a/thirdparty/mbedtls/include/mbedtls/check_config.h b/modules/mbedtls/mbedtls/include/mbedtls/check_config.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/check_config.h
rename to modules/mbedtls/mbedtls/include/mbedtls/check_config.h
diff --git a/thirdparty/mbedtls/include/mbedtls/cipher.h b/modules/mbedtls/mbedtls/include/mbedtls/cipher.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/cipher.h
rename to modules/mbedtls/mbedtls/include/mbedtls/cipher.h
diff --git a/thirdparty/mbedtls/include/mbedtls/cipher_internal.h b/modules/mbedtls/mbedtls/include/mbedtls/cipher_internal.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/cipher_internal.h
rename to modules/mbedtls/mbedtls/include/mbedtls/cipher_internal.h
diff --git a/thirdparty/mbedtls/include/mbedtls/cmac.h b/modules/mbedtls/mbedtls/include/mbedtls/cmac.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/cmac.h
rename to modules/mbedtls/mbedtls/include/mbedtls/cmac.h
diff --git a/thirdparty/mbedtls/include/mbedtls/compat-1.3.h b/modules/mbedtls/mbedtls/include/mbedtls/compat-1.3.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/compat-1.3.h
rename to modules/mbedtls/mbedtls/include/mbedtls/compat-1.3.h
diff --git a/thirdparty/mbedtls/include/mbedtls/config.h b/modules/mbedtls/mbedtls/include/mbedtls/config.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/config.h
rename to modules/mbedtls/mbedtls/include/mbedtls/config.h
diff --git a/thirdparty/mbedtls/include/mbedtls/constant_time.h b/modules/mbedtls/mbedtls/include/mbedtls/constant_time.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/constant_time.h
rename to modules/mbedtls/mbedtls/include/mbedtls/constant_time.h
diff --git a/thirdparty/mbedtls/include/mbedtls/ctr_drbg.h b/modules/mbedtls/mbedtls/include/mbedtls/ctr_drbg.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/ctr_drbg.h
rename to modules/mbedtls/mbedtls/include/mbedtls/ctr_drbg.h
diff --git a/thirdparty/mbedtls/include/mbedtls/debug.h b/modules/mbedtls/mbedtls/include/mbedtls/debug.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/debug.h
rename to modules/mbedtls/mbedtls/include/mbedtls/debug.h
diff --git a/thirdparty/mbedtls/include/mbedtls/des.h b/modules/mbedtls/mbedtls/include/mbedtls/des.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/des.h
rename to modules/mbedtls/mbedtls/include/mbedtls/des.h
diff --git a/thirdparty/mbedtls/include/mbedtls/dhm.h b/modules/mbedtls/mbedtls/include/mbedtls/dhm.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/dhm.h
rename to modules/mbedtls/mbedtls/include/mbedtls/dhm.h
diff --git a/thirdparty/mbedtls/include/mbedtls/ecdh.h b/modules/mbedtls/mbedtls/include/mbedtls/ecdh.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/ecdh.h
rename to modules/mbedtls/mbedtls/include/mbedtls/ecdh.h
diff --git a/thirdparty/mbedtls/include/mbedtls/ecdsa.h b/modules/mbedtls/mbedtls/include/mbedtls/ecdsa.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/ecdsa.h
rename to modules/mbedtls/mbedtls/include/mbedtls/ecdsa.h
diff --git a/thirdparty/mbedtls/include/mbedtls/ecjpake.h b/modules/mbedtls/mbedtls/include/mbedtls/ecjpake.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/ecjpake.h
rename to modules/mbedtls/mbedtls/include/mbedtls/ecjpake.h
diff --git a/thirdparty/mbedtls/include/mbedtls/ecp.h b/modules/mbedtls/mbedtls/include/mbedtls/ecp.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/ecp.h
rename to modules/mbedtls/mbedtls/include/mbedtls/ecp.h
diff --git a/thirdparty/mbedtls/include/mbedtls/ecp_internal.h b/modules/mbedtls/mbedtls/include/mbedtls/ecp_internal.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/ecp_internal.h
rename to modules/mbedtls/mbedtls/include/mbedtls/ecp_internal.h
diff --git a/thirdparty/mbedtls/include/mbedtls/entropy.h b/modules/mbedtls/mbedtls/include/mbedtls/entropy.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/entropy.h
rename to modules/mbedtls/mbedtls/include/mbedtls/entropy.h
diff --git a/thirdparty/mbedtls/include/mbedtls/entropy_poll.h b/modules/mbedtls/mbedtls/include/mbedtls/entropy_poll.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/entropy_poll.h
rename to modules/mbedtls/mbedtls/include/mbedtls/entropy_poll.h
diff --git a/thirdparty/mbedtls/include/mbedtls/error.h b/modules/mbedtls/mbedtls/include/mbedtls/error.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/error.h
rename to modules/mbedtls/mbedtls/include/mbedtls/error.h
diff --git a/thirdparty/mbedtls/include/mbedtls/gcm.h b/modules/mbedtls/mbedtls/include/mbedtls/gcm.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/gcm.h
rename to modules/mbedtls/mbedtls/include/mbedtls/gcm.h
diff --git a/thirdparty/mbedtls/include/mbedtls/havege.h b/modules/mbedtls/mbedtls/include/mbedtls/havege.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/havege.h
rename to modules/mbedtls/mbedtls/include/mbedtls/havege.h
diff --git a/thirdparty/mbedtls/include/mbedtls/hkdf.h b/modules/mbedtls/mbedtls/include/mbedtls/hkdf.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/hkdf.h
rename to modules/mbedtls/mbedtls/include/mbedtls/hkdf.h
diff --git a/thirdparty/mbedtls/include/mbedtls/hmac_drbg.h b/modules/mbedtls/mbedtls/include/mbedtls/hmac_drbg.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/hmac_drbg.h
rename to modules/mbedtls/mbedtls/include/mbedtls/hmac_drbg.h
diff --git a/thirdparty/mbedtls/include/mbedtls/md.h b/modules/mbedtls/mbedtls/include/mbedtls/md.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/md.h
rename to modules/mbedtls/mbedtls/include/mbedtls/md.h
diff --git a/thirdparty/mbedtls/include/mbedtls/md2.h b/modules/mbedtls/mbedtls/include/mbedtls/md2.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/md2.h
rename to modules/mbedtls/mbedtls/include/mbedtls/md2.h
diff --git a/thirdparty/mbedtls/include/mbedtls/md4.h b/modules/mbedtls/mbedtls/include/mbedtls/md4.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/md4.h
rename to modules/mbedtls/mbedtls/include/mbedtls/md4.h
diff --git a/thirdparty/mbedtls/include/mbedtls/md5.h b/modules/mbedtls/mbedtls/include/mbedtls/md5.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/md5.h
rename to modules/mbedtls/mbedtls/include/mbedtls/md5.h
diff --git a/thirdparty/mbedtls/include/mbedtls/md_internal.h b/modules/mbedtls/mbedtls/include/mbedtls/md_internal.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/md_internal.h
rename to modules/mbedtls/mbedtls/include/mbedtls/md_internal.h
diff --git a/thirdparty/mbedtls/include/mbedtls/memory_buffer_alloc.h b/modules/mbedtls/mbedtls/include/mbedtls/memory_buffer_alloc.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/memory_buffer_alloc.h
rename to modules/mbedtls/mbedtls/include/mbedtls/memory_buffer_alloc.h
diff --git a/thirdparty/mbedtls/include/mbedtls/net.h b/modules/mbedtls/mbedtls/include/mbedtls/net.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/net.h
rename to modules/mbedtls/mbedtls/include/mbedtls/net.h
diff --git a/thirdparty/mbedtls/include/mbedtls/net_sockets.h b/modules/mbedtls/mbedtls/include/mbedtls/net_sockets.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/net_sockets.h
rename to modules/mbedtls/mbedtls/include/mbedtls/net_sockets.h
diff --git a/thirdparty/mbedtls/include/mbedtls/nist_kw.h b/modules/mbedtls/mbedtls/include/mbedtls/nist_kw.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/nist_kw.h
rename to modules/mbedtls/mbedtls/include/mbedtls/nist_kw.h
diff --git a/thirdparty/mbedtls/include/mbedtls/oid.h b/modules/mbedtls/mbedtls/include/mbedtls/oid.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/oid.h
rename to modules/mbedtls/mbedtls/include/mbedtls/oid.h
diff --git a/thirdparty/mbedtls/include/mbedtls/padlock.h b/modules/mbedtls/mbedtls/include/mbedtls/padlock.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/padlock.h
rename to modules/mbedtls/mbedtls/include/mbedtls/padlock.h
diff --git a/thirdparty/mbedtls/include/mbedtls/pem.h b/modules/mbedtls/mbedtls/include/mbedtls/pem.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/pem.h
rename to modules/mbedtls/mbedtls/include/mbedtls/pem.h
diff --git a/thirdparty/mbedtls/include/mbedtls/pk.h b/modules/mbedtls/mbedtls/include/mbedtls/pk.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/pk.h
rename to modules/mbedtls/mbedtls/include/mbedtls/pk.h
diff --git a/thirdparty/mbedtls/include/mbedtls/pk_internal.h b/modules/mbedtls/mbedtls/include/mbedtls/pk_internal.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/pk_internal.h
rename to modules/mbedtls/mbedtls/include/mbedtls/pk_internal.h
diff --git a/thirdparty/mbedtls/include/mbedtls/pkcs11.h b/modules/mbedtls/mbedtls/include/mbedtls/pkcs11.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/pkcs11.h
rename to modules/mbedtls/mbedtls/include/mbedtls/pkcs11.h
diff --git a/thirdparty/mbedtls/include/mbedtls/pkcs12.h b/modules/mbedtls/mbedtls/include/mbedtls/pkcs12.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/pkcs12.h
rename to modules/mbedtls/mbedtls/include/mbedtls/pkcs12.h
diff --git a/thirdparty/mbedtls/include/mbedtls/pkcs5.h b/modules/mbedtls/mbedtls/include/mbedtls/pkcs5.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/pkcs5.h
rename to modules/mbedtls/mbedtls/include/mbedtls/pkcs5.h
diff --git a/thirdparty/mbedtls/include/mbedtls/platform.h b/modules/mbedtls/mbedtls/include/mbedtls/platform.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/platform.h
rename to modules/mbedtls/mbedtls/include/mbedtls/platform.h
diff --git a/thirdparty/mbedtls/include/mbedtls/platform_time.h b/modules/mbedtls/mbedtls/include/mbedtls/platform_time.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/platform_time.h
rename to modules/mbedtls/mbedtls/include/mbedtls/platform_time.h
diff --git a/thirdparty/mbedtls/include/mbedtls/platform_util.h b/modules/mbedtls/mbedtls/include/mbedtls/platform_util.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/platform_util.h
rename to modules/mbedtls/mbedtls/include/mbedtls/platform_util.h
diff --git a/thirdparty/mbedtls/include/mbedtls/poly1305.h b/modules/mbedtls/mbedtls/include/mbedtls/poly1305.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/poly1305.h
rename to modules/mbedtls/mbedtls/include/mbedtls/poly1305.h
diff --git a/thirdparty/mbedtls/include/mbedtls/ripemd160.h b/modules/mbedtls/mbedtls/include/mbedtls/ripemd160.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/ripemd160.h
rename to modules/mbedtls/mbedtls/include/mbedtls/ripemd160.h
diff --git a/thirdparty/mbedtls/include/mbedtls/rsa.h b/modules/mbedtls/mbedtls/include/mbedtls/rsa.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/rsa.h
rename to modules/mbedtls/mbedtls/include/mbedtls/rsa.h
diff --git a/thirdparty/mbedtls/include/mbedtls/rsa_internal.h b/modules/mbedtls/mbedtls/include/mbedtls/rsa_internal.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/rsa_internal.h
rename to modules/mbedtls/mbedtls/include/mbedtls/rsa_internal.h
diff --git a/thirdparty/mbedtls/include/mbedtls/sha1.h b/modules/mbedtls/mbedtls/include/mbedtls/sha1.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/sha1.h
rename to modules/mbedtls/mbedtls/include/mbedtls/sha1.h
diff --git a/thirdparty/mbedtls/include/mbedtls/sha256.h b/modules/mbedtls/mbedtls/include/mbedtls/sha256.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/sha256.h
rename to modules/mbedtls/mbedtls/include/mbedtls/sha256.h
diff --git a/thirdparty/mbedtls/include/mbedtls/sha512.h b/modules/mbedtls/mbedtls/include/mbedtls/sha512.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/sha512.h
rename to modules/mbedtls/mbedtls/include/mbedtls/sha512.h
diff --git a/thirdparty/mbedtls/include/mbedtls/ssl.h b/modules/mbedtls/mbedtls/include/mbedtls/ssl.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/ssl.h
rename to modules/mbedtls/mbedtls/include/mbedtls/ssl.h
diff --git a/thirdparty/mbedtls/include/mbedtls/ssl_cache.h b/modules/mbedtls/mbedtls/include/mbedtls/ssl_cache.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/ssl_cache.h
rename to modules/mbedtls/mbedtls/include/mbedtls/ssl_cache.h
diff --git a/thirdparty/mbedtls/include/mbedtls/ssl_ciphersuites.h b/modules/mbedtls/mbedtls/include/mbedtls/ssl_ciphersuites.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/ssl_ciphersuites.h
rename to modules/mbedtls/mbedtls/include/mbedtls/ssl_ciphersuites.h
diff --git a/thirdparty/mbedtls/include/mbedtls/ssl_cookie.h b/modules/mbedtls/mbedtls/include/mbedtls/ssl_cookie.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/ssl_cookie.h
rename to modules/mbedtls/mbedtls/include/mbedtls/ssl_cookie.h
diff --git a/thirdparty/mbedtls/include/mbedtls/ssl_internal.h b/modules/mbedtls/mbedtls/include/mbedtls/ssl_internal.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/ssl_internal.h
rename to modules/mbedtls/mbedtls/include/mbedtls/ssl_internal.h
diff --git a/thirdparty/mbedtls/include/mbedtls/ssl_ticket.h b/modules/mbedtls/mbedtls/include/mbedtls/ssl_ticket.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/ssl_ticket.h
rename to modules/mbedtls/mbedtls/include/mbedtls/ssl_ticket.h
diff --git a/thirdparty/mbedtls/include/mbedtls/threading.h b/modules/mbedtls/mbedtls/include/mbedtls/threading.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/threading.h
rename to modules/mbedtls/mbedtls/include/mbedtls/threading.h
diff --git a/thirdparty/mbedtls/include/mbedtls/timing.h b/modules/mbedtls/mbedtls/include/mbedtls/timing.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/timing.h
rename to modules/mbedtls/mbedtls/include/mbedtls/timing.h
diff --git a/thirdparty/mbedtls/include/mbedtls/version.h b/modules/mbedtls/mbedtls/include/mbedtls/version.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/version.h
rename to modules/mbedtls/mbedtls/include/mbedtls/version.h
diff --git a/thirdparty/mbedtls/include/mbedtls/x509.h b/modules/mbedtls/mbedtls/include/mbedtls/x509.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/x509.h
rename to modules/mbedtls/mbedtls/include/mbedtls/x509.h
diff --git a/thirdparty/mbedtls/include/mbedtls/x509_crl.h b/modules/mbedtls/mbedtls/include/mbedtls/x509_crl.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/x509_crl.h
rename to modules/mbedtls/mbedtls/include/mbedtls/x509_crl.h
diff --git a/thirdparty/mbedtls/include/mbedtls/x509_crt.h b/modules/mbedtls/mbedtls/include/mbedtls/x509_crt.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/x509_crt.h
rename to modules/mbedtls/mbedtls/include/mbedtls/x509_crt.h
diff --git a/thirdparty/mbedtls/include/mbedtls/x509_csr.h b/modules/mbedtls/mbedtls/include/mbedtls/x509_csr.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/x509_csr.h
rename to modules/mbedtls/mbedtls/include/mbedtls/x509_csr.h
diff --git a/thirdparty/mbedtls/include/mbedtls/xtea.h b/modules/mbedtls/mbedtls/include/mbedtls/xtea.h
similarity index 100%
rename from thirdparty/mbedtls/include/mbedtls/xtea.h
rename to modules/mbedtls/mbedtls/include/mbedtls/xtea.h
diff --git a/thirdparty/mbedtls/library/aes.c b/modules/mbedtls/mbedtls/library/aes.c
similarity index 100%
rename from thirdparty/mbedtls/library/aes.c
rename to modules/mbedtls/mbedtls/library/aes.c
diff --git a/thirdparty/mbedtls/library/aesni.c b/modules/mbedtls/mbedtls/library/aesni.c
similarity index 100%
rename from thirdparty/mbedtls/library/aesni.c
rename to modules/mbedtls/mbedtls/library/aesni.c
diff --git a/thirdparty/mbedtls/library/arc4.c b/modules/mbedtls/mbedtls/library/arc4.c
similarity index 100%
rename from thirdparty/mbedtls/library/arc4.c
rename to modules/mbedtls/mbedtls/library/arc4.c
diff --git a/thirdparty/mbedtls/library/aria.c b/modules/mbedtls/mbedtls/library/aria.c
similarity index 100%
rename from thirdparty/mbedtls/library/aria.c
rename to modules/mbedtls/mbedtls/library/aria.c
diff --git a/thirdparty/mbedtls/library/asn1parse.c b/modules/mbedtls/mbedtls/library/asn1parse.c
similarity index 100%
rename from thirdparty/mbedtls/library/asn1parse.c
rename to modules/mbedtls/mbedtls/library/asn1parse.c
diff --git a/thirdparty/mbedtls/library/asn1write.c b/modules/mbedtls/mbedtls/library/asn1write.c
similarity index 100%
rename from thirdparty/mbedtls/library/asn1write.c
rename to modules/mbedtls/mbedtls/library/asn1write.c
diff --git a/thirdparty/mbedtls/library/base64.c b/modules/mbedtls/mbedtls/library/base64.c
similarity index 100%
rename from thirdparty/mbedtls/library/base64.c
rename to modules/mbedtls/mbedtls/library/base64.c
diff --git a/thirdparty/mbedtls/library/bignum.c b/modules/mbedtls/mbedtls/library/bignum.c
similarity index 100%
rename from thirdparty/mbedtls/library/bignum.c
rename to modules/mbedtls/mbedtls/library/bignum.c
diff --git a/thirdparty/mbedtls/library/blowfish.c b/modules/mbedtls/mbedtls/library/blowfish.c
similarity index 100%
rename from thirdparty/mbedtls/library/blowfish.c
rename to modules/mbedtls/mbedtls/library/blowfish.c
diff --git a/thirdparty/mbedtls/library/camellia.c b/modules/mbedtls/mbedtls/library/camellia.c
similarity index 100%
rename from thirdparty/mbedtls/library/camellia.c
rename to modules/mbedtls/mbedtls/library/camellia.c
diff --git a/thirdparty/mbedtls/library/ccm.c b/modules/mbedtls/mbedtls/library/ccm.c
similarity index 100%
rename from thirdparty/mbedtls/library/ccm.c
rename to modules/mbedtls/mbedtls/library/ccm.c
diff --git a/thirdparty/mbedtls/library/certs.c b/modules/mbedtls/mbedtls/library/certs.c
similarity index 100%
rename from thirdparty/mbedtls/library/certs.c
rename to modules/mbedtls/mbedtls/library/certs.c
diff --git a/thirdparty/mbedtls/library/chacha20.c b/modules/mbedtls/mbedtls/library/chacha20.c
similarity index 100%
rename from thirdparty/mbedtls/library/chacha20.c
rename to modules/mbedtls/mbedtls/library/chacha20.c
diff --git a/thirdparty/mbedtls/library/chachapoly.c b/modules/mbedtls/mbedtls/library/chachapoly.c
similarity index 100%
rename from thirdparty/mbedtls/library/chachapoly.c
rename to modules/mbedtls/mbedtls/library/chachapoly.c
diff --git a/thirdparty/mbedtls/library/check_crypto_config.h b/modules/mbedtls/mbedtls/library/check_crypto_config.h
similarity index 100%
rename from thirdparty/mbedtls/library/check_crypto_config.h
rename to modules/mbedtls/mbedtls/library/check_crypto_config.h
diff --git a/thirdparty/mbedtls/library/cipher.c b/modules/mbedtls/mbedtls/library/cipher.c
similarity index 100%
rename from thirdparty/mbedtls/library/cipher.c
rename to modules/mbedtls/mbedtls/library/cipher.c
diff --git a/thirdparty/mbedtls/library/cipher_wrap.c b/modules/mbedtls/mbedtls/library/cipher_wrap.c
similarity index 100%
rename from thirdparty/mbedtls/library/cipher_wrap.c
rename to modules/mbedtls/mbedtls/library/cipher_wrap.c
diff --git a/thirdparty/mbedtls/library/cmac.c b/modules/mbedtls/mbedtls/library/cmac.c
similarity index 100%
rename from thirdparty/mbedtls/library/cmac.c
rename to modules/mbedtls/mbedtls/library/cmac.c
diff --git a/thirdparty/mbedtls/library/common.h b/modules/mbedtls/mbedtls/library/common.h
similarity index 100%
rename from thirdparty/mbedtls/library/common.h
rename to modules/mbedtls/mbedtls/library/common.h
diff --git a/thirdparty/mbedtls/library/constant_time.c b/modules/mbedtls/mbedtls/library/constant_time.c
similarity index 100%
rename from thirdparty/mbedtls/library/constant_time.c
rename to modules/mbedtls/mbedtls/library/constant_time.c
diff --git a/thirdparty/mbedtls/library/constant_time_internal.h b/modules/mbedtls/mbedtls/library/constant_time_internal.h
similarity index 100%
rename from thirdparty/mbedtls/library/constant_time_internal.h
rename to modules/mbedtls/mbedtls/library/constant_time_internal.h
diff --git a/thirdparty/mbedtls/library/constant_time_invasive.h b/modules/mbedtls/mbedtls/library/constant_time_invasive.h
similarity index 100%
rename from thirdparty/mbedtls/library/constant_time_invasive.h
rename to modules/mbedtls/mbedtls/library/constant_time_invasive.h
diff --git a/thirdparty/mbedtls/library/ctr_drbg.c b/modules/mbedtls/mbedtls/library/ctr_drbg.c
similarity index 100%
rename from thirdparty/mbedtls/library/ctr_drbg.c
rename to modules/mbedtls/mbedtls/library/ctr_drbg.c
diff --git a/thirdparty/mbedtls/library/debug.c b/modules/mbedtls/mbedtls/library/debug.c
similarity index 100%
rename from thirdparty/mbedtls/library/debug.c
rename to modules/mbedtls/mbedtls/library/debug.c
diff --git a/thirdparty/mbedtls/library/des.c b/modules/mbedtls/mbedtls/library/des.c
similarity index 100%
rename from thirdparty/mbedtls/library/des.c
rename to modules/mbedtls/mbedtls/library/des.c
diff --git a/thirdparty/mbedtls/library/dhm.c b/modules/mbedtls/mbedtls/library/dhm.c
similarity index 100%
rename from thirdparty/mbedtls/library/dhm.c
rename to modules/mbedtls/mbedtls/library/dhm.c
diff --git a/thirdparty/mbedtls/library/ecdh.c b/modules/mbedtls/mbedtls/library/ecdh.c
similarity index 100%
rename from thirdparty/mbedtls/library/ecdh.c
rename to modules/mbedtls/mbedtls/library/ecdh.c
diff --git a/thirdparty/mbedtls/library/ecdsa.c b/modules/mbedtls/mbedtls/library/ecdsa.c
similarity index 100%
rename from thirdparty/mbedtls/library/ecdsa.c
rename to modules/mbedtls/mbedtls/library/ecdsa.c
diff --git a/thirdparty/mbedtls/library/ecjpake.c b/modules/mbedtls/mbedtls/library/ecjpake.c
similarity index 100%
rename from thirdparty/mbedtls/library/ecjpake.c
rename to modules/mbedtls/mbedtls/library/ecjpake.c
diff --git a/thirdparty/mbedtls/library/ecp.c b/modules/mbedtls/mbedtls/library/ecp.c
similarity index 100%
rename from thirdparty/mbedtls/library/ecp.c
rename to modules/mbedtls/mbedtls/library/ecp.c
diff --git a/thirdparty/mbedtls/library/ecp_curves.c b/modules/mbedtls/mbedtls/library/ecp_curves.c
similarity index 100%
rename from thirdparty/mbedtls/library/ecp_curves.c
rename to modules/mbedtls/mbedtls/library/ecp_curves.c
diff --git a/thirdparty/mbedtls/library/ecp_invasive.h b/modules/mbedtls/mbedtls/library/ecp_invasive.h
similarity index 100%
rename from thirdparty/mbedtls/library/ecp_invasive.h
rename to modules/mbedtls/mbedtls/library/ecp_invasive.h
diff --git a/thirdparty/mbedtls/library/entropy.c b/modules/mbedtls/mbedtls/library/entropy.c
similarity index 100%
rename from thirdparty/mbedtls/library/entropy.c
rename to modules/mbedtls/mbedtls/library/entropy.c
diff --git a/thirdparty/mbedtls/library/entropy_poll.c b/modules/mbedtls/mbedtls/library/entropy_poll.c
similarity index 100%
rename from thirdparty/mbedtls/library/entropy_poll.c
rename to modules/mbedtls/mbedtls/library/entropy_poll.c
diff --git a/thirdparty/mbedtls/library/error.c b/modules/mbedtls/mbedtls/library/error.c
similarity index 100%
rename from thirdparty/mbedtls/library/error.c
rename to modules/mbedtls/mbedtls/library/error.c
diff --git a/thirdparty/mbedtls/library/gcm.c b/modules/mbedtls/mbedtls/library/gcm.c
similarity index 100%
rename from thirdparty/mbedtls/library/gcm.c
rename to modules/mbedtls/mbedtls/library/gcm.c
diff --git a/thirdparty/mbedtls/library/godot_core_mbedtls_platform.c b/modules/mbedtls/mbedtls/library/godot_core_mbedtls_platform.c
similarity index 100%
rename from thirdparty/mbedtls/library/godot_core_mbedtls_platform.c
rename to modules/mbedtls/mbedtls/library/godot_core_mbedtls_platform.c
diff --git a/thirdparty/mbedtls/library/havege.c b/modules/mbedtls/mbedtls/library/havege.c
similarity index 100%
rename from thirdparty/mbedtls/library/havege.c
rename to modules/mbedtls/mbedtls/library/havege.c
diff --git a/thirdparty/mbedtls/library/hkdf.c b/modules/mbedtls/mbedtls/library/hkdf.c
similarity index 100%
rename from thirdparty/mbedtls/library/hkdf.c
rename to modules/mbedtls/mbedtls/library/hkdf.c
diff --git a/thirdparty/mbedtls/library/hmac_drbg.c b/modules/mbedtls/mbedtls/library/hmac_drbg.c
similarity index 100%
rename from thirdparty/mbedtls/library/hmac_drbg.c
rename to modules/mbedtls/mbedtls/library/hmac_drbg.c
diff --git a/thirdparty/mbedtls/library/md.c b/modules/mbedtls/mbedtls/library/md.c
similarity index 100%
rename from thirdparty/mbedtls/library/md.c
rename to modules/mbedtls/mbedtls/library/md.c
diff --git a/thirdparty/mbedtls/library/md2.c b/modules/mbedtls/mbedtls/library/md2.c
similarity index 100%
rename from thirdparty/mbedtls/library/md2.c
rename to modules/mbedtls/mbedtls/library/md2.c
diff --git a/thirdparty/mbedtls/library/md4.c b/modules/mbedtls/mbedtls/library/md4.c
similarity index 100%
rename from thirdparty/mbedtls/library/md4.c
rename to modules/mbedtls/mbedtls/library/md4.c
diff --git a/thirdparty/mbedtls/library/md5.c b/modules/mbedtls/mbedtls/library/md5.c
similarity index 100%
rename from thirdparty/mbedtls/library/md5.c
rename to modules/mbedtls/mbedtls/library/md5.c
diff --git a/thirdparty/mbedtls/library/memory_buffer_alloc.c b/modules/mbedtls/mbedtls/library/memory_buffer_alloc.c
similarity index 100%
rename from thirdparty/mbedtls/library/memory_buffer_alloc.c
rename to modules/mbedtls/mbedtls/library/memory_buffer_alloc.c
diff --git a/thirdparty/mbedtls/library/mps_common.h b/modules/mbedtls/mbedtls/library/mps_common.h
similarity index 100%
rename from thirdparty/mbedtls/library/mps_common.h
rename to modules/mbedtls/mbedtls/library/mps_common.h
diff --git a/thirdparty/mbedtls/library/mps_error.h b/modules/mbedtls/mbedtls/library/mps_error.h
similarity index 100%
rename from thirdparty/mbedtls/library/mps_error.h
rename to modules/mbedtls/mbedtls/library/mps_error.h
diff --git a/thirdparty/mbedtls/library/mps_reader.c b/modules/mbedtls/mbedtls/library/mps_reader.c
similarity index 100%
rename from thirdparty/mbedtls/library/mps_reader.c
rename to modules/mbedtls/mbedtls/library/mps_reader.c
diff --git a/thirdparty/mbedtls/library/mps_reader.h b/modules/mbedtls/mbedtls/library/mps_reader.h
similarity index 100%
rename from thirdparty/mbedtls/library/mps_reader.h
rename to modules/mbedtls/mbedtls/library/mps_reader.h
diff --git a/thirdparty/mbedtls/library/mps_trace.c b/modules/mbedtls/mbedtls/library/mps_trace.c
similarity index 100%
rename from thirdparty/mbedtls/library/mps_trace.c
rename to modules/mbedtls/mbedtls/library/mps_trace.c
diff --git a/thirdparty/mbedtls/library/mps_trace.h b/modules/mbedtls/mbedtls/library/mps_trace.h
similarity index 100%
rename from thirdparty/mbedtls/library/mps_trace.h
rename to modules/mbedtls/mbedtls/library/mps_trace.h
diff --git a/thirdparty/mbedtls/library/net_sockets.c b/modules/mbedtls/mbedtls/library/net_sockets.c
similarity index 100%
rename from thirdparty/mbedtls/library/net_sockets.c
rename to modules/mbedtls/mbedtls/library/net_sockets.c
diff --git a/thirdparty/mbedtls/library/nist_kw.c b/modules/mbedtls/mbedtls/library/nist_kw.c
similarity index 100%
rename from thirdparty/mbedtls/library/nist_kw.c
rename to modules/mbedtls/mbedtls/library/nist_kw.c
diff --git a/thirdparty/mbedtls/library/oid.c b/modules/mbedtls/mbedtls/library/oid.c
similarity index 100%
rename from thirdparty/mbedtls/library/oid.c
rename to modules/mbedtls/mbedtls/library/oid.c
diff --git a/thirdparty/mbedtls/library/padlock.c b/modules/mbedtls/mbedtls/library/padlock.c
similarity index 100%
rename from thirdparty/mbedtls/library/padlock.c
rename to modules/mbedtls/mbedtls/library/padlock.c
diff --git a/thirdparty/mbedtls/library/pem.c b/modules/mbedtls/mbedtls/library/pem.c
similarity index 100%
rename from thirdparty/mbedtls/library/pem.c
rename to modules/mbedtls/mbedtls/library/pem.c
diff --git a/thirdparty/mbedtls/library/pk.c b/modules/mbedtls/mbedtls/library/pk.c
similarity index 100%
rename from thirdparty/mbedtls/library/pk.c
rename to modules/mbedtls/mbedtls/library/pk.c
diff --git a/thirdparty/mbedtls/library/pk_wrap.c b/modules/mbedtls/mbedtls/library/pk_wrap.c
similarity index 100%
rename from thirdparty/mbedtls/library/pk_wrap.c
rename to modules/mbedtls/mbedtls/library/pk_wrap.c
diff --git a/thirdparty/mbedtls/library/pkcs11.c b/modules/mbedtls/mbedtls/library/pkcs11.c
similarity index 100%
rename from thirdparty/mbedtls/library/pkcs11.c
rename to modules/mbedtls/mbedtls/library/pkcs11.c
diff --git a/thirdparty/mbedtls/library/pkcs12.c b/modules/mbedtls/mbedtls/library/pkcs12.c
similarity index 100%
rename from thirdparty/mbedtls/library/pkcs12.c
rename to modules/mbedtls/mbedtls/library/pkcs12.c
diff --git a/thirdparty/mbedtls/library/pkcs5.c b/modules/mbedtls/mbedtls/library/pkcs5.c
similarity index 100%
rename from thirdparty/mbedtls/library/pkcs5.c
rename to modules/mbedtls/mbedtls/library/pkcs5.c
diff --git a/thirdparty/mbedtls/library/pkparse.c b/modules/mbedtls/mbedtls/library/pkparse.c
similarity index 100%
rename from thirdparty/mbedtls/library/pkparse.c
rename to modules/mbedtls/mbedtls/library/pkparse.c
diff --git a/thirdparty/mbedtls/library/pkwrite.c b/modules/mbedtls/mbedtls/library/pkwrite.c
similarity index 100%
rename from thirdparty/mbedtls/library/pkwrite.c
rename to modules/mbedtls/mbedtls/library/pkwrite.c
diff --git a/thirdparty/mbedtls/library/platform.c b/modules/mbedtls/mbedtls/library/platform.c
similarity index 100%
rename from thirdparty/mbedtls/library/platform.c
rename to modules/mbedtls/mbedtls/library/platform.c
diff --git a/thirdparty/mbedtls/library/platform_util.c b/modules/mbedtls/mbedtls/library/platform_util.c
similarity index 100%
rename from thirdparty/mbedtls/library/platform_util.c
rename to modules/mbedtls/mbedtls/library/platform_util.c
diff --git a/thirdparty/mbedtls/library/poly1305.c b/modules/mbedtls/mbedtls/library/poly1305.c
similarity index 100%
rename from thirdparty/mbedtls/library/poly1305.c
rename to modules/mbedtls/mbedtls/library/poly1305.c
diff --git a/thirdparty/mbedtls/library/ripemd160.c b/modules/mbedtls/mbedtls/library/ripemd160.c
similarity index 100%
rename from thirdparty/mbedtls/library/ripemd160.c
rename to modules/mbedtls/mbedtls/library/ripemd160.c
diff --git a/thirdparty/mbedtls/library/rsa.c b/modules/mbedtls/mbedtls/library/rsa.c
similarity index 100%
rename from thirdparty/mbedtls/library/rsa.c
rename to modules/mbedtls/mbedtls/library/rsa.c
diff --git a/thirdparty/mbedtls/library/rsa_internal.c b/modules/mbedtls/mbedtls/library/rsa_internal.c
similarity index 100%
rename from thirdparty/mbedtls/library/rsa_internal.c
rename to modules/mbedtls/mbedtls/library/rsa_internal.c
diff --git a/thirdparty/mbedtls/library/sha1.c b/modules/mbedtls/mbedtls/library/sha1.c
similarity index 100%
rename from thirdparty/mbedtls/library/sha1.c
rename to modules/mbedtls/mbedtls/library/sha1.c
diff --git a/thirdparty/mbedtls/library/sha256.c b/modules/mbedtls/mbedtls/library/sha256.c
similarity index 100%
rename from thirdparty/mbedtls/library/sha256.c
rename to modules/mbedtls/mbedtls/library/sha256.c
diff --git a/thirdparty/mbedtls/library/sha512.c b/modules/mbedtls/mbedtls/library/sha512.c
similarity index 100%
rename from thirdparty/mbedtls/library/sha512.c
rename to modules/mbedtls/mbedtls/library/sha512.c
diff --git a/thirdparty/mbedtls/library/ssl_cache.c b/modules/mbedtls/mbedtls/library/ssl_cache.c
similarity index 100%
rename from thirdparty/mbedtls/library/ssl_cache.c
rename to modules/mbedtls/mbedtls/library/ssl_cache.c
diff --git a/thirdparty/mbedtls/library/ssl_ciphersuites.c b/modules/mbedtls/mbedtls/library/ssl_ciphersuites.c
similarity index 100%
rename from thirdparty/mbedtls/library/ssl_ciphersuites.c
rename to modules/mbedtls/mbedtls/library/ssl_ciphersuites.c
diff --git a/thirdparty/mbedtls/library/ssl_cli.c b/modules/mbedtls/mbedtls/library/ssl_cli.c
similarity index 100%
rename from thirdparty/mbedtls/library/ssl_cli.c
rename to modules/mbedtls/mbedtls/library/ssl_cli.c
diff --git a/thirdparty/mbedtls/library/ssl_cookie.c b/modules/mbedtls/mbedtls/library/ssl_cookie.c
similarity index 100%
rename from thirdparty/mbedtls/library/ssl_cookie.c
rename to modules/mbedtls/mbedtls/library/ssl_cookie.c
diff --git a/thirdparty/mbedtls/library/ssl_msg.c b/modules/mbedtls/mbedtls/library/ssl_msg.c
similarity index 100%
rename from thirdparty/mbedtls/library/ssl_msg.c
rename to modules/mbedtls/mbedtls/library/ssl_msg.c
diff --git a/thirdparty/mbedtls/library/ssl_srv.c b/modules/mbedtls/mbedtls/library/ssl_srv.c
similarity index 100%
rename from thirdparty/mbedtls/library/ssl_srv.c
rename to modules/mbedtls/mbedtls/library/ssl_srv.c
diff --git a/thirdparty/mbedtls/library/ssl_ticket.c b/modules/mbedtls/mbedtls/library/ssl_ticket.c
similarity index 100%
rename from thirdparty/mbedtls/library/ssl_ticket.c
rename to modules/mbedtls/mbedtls/library/ssl_ticket.c
diff --git a/thirdparty/mbedtls/library/ssl_tls.c b/modules/mbedtls/mbedtls/library/ssl_tls.c
similarity index 100%
rename from thirdparty/mbedtls/library/ssl_tls.c
rename to modules/mbedtls/mbedtls/library/ssl_tls.c
diff --git a/thirdparty/mbedtls/library/ssl_tls13_keys.c b/modules/mbedtls/mbedtls/library/ssl_tls13_keys.c
similarity index 100%
rename from thirdparty/mbedtls/library/ssl_tls13_keys.c
rename to modules/mbedtls/mbedtls/library/ssl_tls13_keys.c
diff --git a/thirdparty/mbedtls/library/ssl_tls13_keys.h b/modules/mbedtls/mbedtls/library/ssl_tls13_keys.h
similarity index 100%
rename from thirdparty/mbedtls/library/ssl_tls13_keys.h
rename to modules/mbedtls/mbedtls/library/ssl_tls13_keys.h
diff --git a/thirdparty/mbedtls/library/threading.c b/modules/mbedtls/mbedtls/library/threading.c
similarity index 100%
rename from thirdparty/mbedtls/library/threading.c
rename to modules/mbedtls/mbedtls/library/threading.c
diff --git a/thirdparty/mbedtls/library/timing.c b/modules/mbedtls/mbedtls/library/timing.c
similarity index 100%
rename from thirdparty/mbedtls/library/timing.c
rename to modules/mbedtls/mbedtls/library/timing.c
diff --git a/thirdparty/mbedtls/library/version.c b/modules/mbedtls/mbedtls/library/version.c
similarity index 100%
rename from thirdparty/mbedtls/library/version.c
rename to modules/mbedtls/mbedtls/library/version.c
diff --git a/thirdparty/mbedtls/library/version_features.c b/modules/mbedtls/mbedtls/library/version_features.c
similarity index 100%
rename from thirdparty/mbedtls/library/version_features.c
rename to modules/mbedtls/mbedtls/library/version_features.c
diff --git a/thirdparty/mbedtls/library/x509.c b/modules/mbedtls/mbedtls/library/x509.c
similarity index 100%
rename from thirdparty/mbedtls/library/x509.c
rename to modules/mbedtls/mbedtls/library/x509.c
diff --git a/thirdparty/mbedtls/library/x509_create.c b/modules/mbedtls/mbedtls/library/x509_create.c
similarity index 100%
rename from thirdparty/mbedtls/library/x509_create.c
rename to modules/mbedtls/mbedtls/library/x509_create.c
diff --git a/thirdparty/mbedtls/library/x509_crl.c b/modules/mbedtls/mbedtls/library/x509_crl.c
similarity index 100%
rename from thirdparty/mbedtls/library/x509_crl.c
rename to modules/mbedtls/mbedtls/library/x509_crl.c
diff --git a/thirdparty/mbedtls/library/x509_crt.c b/modules/mbedtls/mbedtls/library/x509_crt.c
similarity index 100%
rename from thirdparty/mbedtls/library/x509_crt.c
rename to modules/mbedtls/mbedtls/library/x509_crt.c
diff --git a/thirdparty/mbedtls/library/x509_csr.c b/modules/mbedtls/mbedtls/library/x509_csr.c
similarity index 100%
rename from thirdparty/mbedtls/library/x509_csr.c
rename to modules/mbedtls/mbedtls/library/x509_csr.c
diff --git a/thirdparty/mbedtls/library/x509write_crt.c b/modules/mbedtls/mbedtls/library/x509write_crt.c
similarity index 100%
rename from thirdparty/mbedtls/library/x509write_crt.c
rename to modules/mbedtls/mbedtls/library/x509write_crt.c
diff --git a/thirdparty/mbedtls/library/x509write_csr.c b/modules/mbedtls/mbedtls/library/x509write_csr.c
similarity index 100%
rename from thirdparty/mbedtls/library/x509write_csr.c
rename to modules/mbedtls/mbedtls/library/x509write_csr.c
diff --git a/thirdparty/mbedtls/library/xtea.c b/modules/mbedtls/mbedtls/library/xtea.c
similarity index 100%
rename from thirdparty/mbedtls/library/xtea.c
rename to modules/mbedtls/mbedtls/library/xtea.c
diff --git a/thirdparty/mbedtls/patches/1453.diff b/modules/mbedtls/mbedtls/patches/1453.diff
similarity index 100%
rename from thirdparty/mbedtls/patches/1453.diff
rename to modules/mbedtls/mbedtls/patches/1453.diff
diff --git a/thirdparty/mbedtls/patches/aesni-no-arm-intrinsics.patch b/modules/mbedtls/mbedtls/patches/aesni-no-arm-intrinsics.patch
similarity index 100%
rename from thirdparty/mbedtls/patches/aesni-no-arm-intrinsics.patch
rename to modules/mbedtls/mbedtls/patches/aesni-no-arm-intrinsics.patch
diff --git a/thirdparty/mbedtls/patches/windows-arm64-hardclock.diff b/modules/mbedtls/mbedtls/patches/windows-arm64-hardclock.diff
similarity index 100%
rename from thirdparty/mbedtls/patches/windows-arm64-hardclock.diff
rename to modules/mbedtls/mbedtls/patches/windows-arm64-hardclock.diff