deps: reflect c-ares source tree

c-ares refactored their source tree in 1.17.0 which we did not apply in
our update to 1.17.1. This commit syncs our source with their new
structure for easier maintenance going forward. cares.gyp is updated
accordingly.

Refs: https://github.com/c-ares/c-ares/pull/349
Refs: https://github.com/nodejs/node/pull/36207

PR-URL: https://github.com/nodejs/node/pull/39653
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>

87 files changed, 79 insertions, 79 deletions

diff --git a/deps/cares/src/AUTHORS b/deps/cares/AUTHORS
index 7db6584c91f..7db6584c91f 100644
--- a/deps/cares/src/AUTHORS
+++ b/deps/cares/AUTHORS
diff --git a/deps/cares/src/NEWS b/deps/cares/NEWS
index 95a2eeea274..95a2eeea274 100644
--- a/deps/cares/src/NEWS
+++ b/deps/cares/NEWS
diff --git a/deps/cares/src/README.cares b/deps/cares/README.cares
index 4dee46eabf8..4dee46eabf8 100644
--- a/deps/cares/src/README.cares
+++ b/deps/cares/README.cares
diff --git a/deps/cares/src/README.md b/deps/cares/README.md
index 148338f9e18..148338f9e18 100644
--- a/deps/cares/src/README.md
+++ b/deps/cares/README.md
diff --git a/deps/cares/src/README.msvc b/deps/cares/README.msvc
index 396f497db40..396f497db40 100644
--- a/deps/cares/src/README.msvc
+++ b/deps/cares/README.msvc
diff --git a/deps/cares/src/RELEASE-NOTES b/deps/cares/RELEASE-NOTES
index e1885425ae3..e1885425ae3 100644
--- a/deps/cares/src/RELEASE-NOTES
+++ b/deps/cares/RELEASE-NOTES
diff --git a/deps/cares/src/TODO b/deps/cares/TODO
index fa31cea6fb7..fa31cea6fb7 100644
--- a/deps/cares/src/TODO
+++ b/deps/cares/TODO
diff --git a/deps/cares/cares.gyp b/deps/cares/cares.gyp
index 0dc4ff93177..15673e2375f 100644
--- a/deps/cares/cares.gyp
+++ b/deps/cares/cares.gyp
@@ -30,86 +30,86 @@
     {
       'target_name': 'cares',
       'type': '<(library)',
-      'include_dirs': [ 'include', 'src' ],
+      'include_dirs': [ 'include', 'src/lib' ],
       'direct_dependent_settings': {
-        'include_dirs': [ 'include' ]
+        'include_dirs': [ 'include', 'src/lib' ]
       },
       'sources': [
         'include/ares.h',
+        'include/ares_dns.h',
         'include/ares_rules.h',
         'include/ares_version.h',
-        'include/nameser.h',
-        'src/ares_android.c',
-        'src/ares_cancel.c',
-        'src/ares__close_sockets.c',
-        'src/ares_create_query.c',
-        'src/ares_data.c',
-        'src/ares_data.h',
-        'src/ares_destroy.c',
-        'src/ares_dns.h',
-        'src/ares_expand_name.c',
-        'src/ares_expand_string.c',
-        'src/ares_fds.c',
-        'src/ares_free_hostent.c',
-        'src/ares_free_string.c',
-        'src/ares_freeaddrinfo.c',
-        'src/ares_getenv.h',
-        'src/ares_getaddrinfo.c',
-        'src/ares_gethostbyaddr.c',
-        'src/ares_gethostbyname.c',
-        'src/ares__get_hostent.c',
-        'src/ares_getnameinfo.c',
-        'src/ares_getopt.c',
-        'src/ares_getopt.h',
-        'src/ares_getsock.c',
-        'src/ares_init.c',
-        'src/ares_ipv6.h',
-        'src/ares_library_init.c',
-        'src/ares_library_init.h',
-        'src/ares_llist.c',
-        'src/ares_llist.h',
-        'src/ares_mkquery.c',
-        'src/ares_nowarn.c',
-        'src/ares_nowarn.h',
-        'src/ares_options.c',
-        'src/ares__parse_into_addrinfo.c',
-        'src/ares_parse_aaaa_reply.c',
-        'src/ares_parse_a_reply.c',
-        'src/ares_parse_caa_reply.c',
-        'src/ares_parse_mx_reply.c',
-        'src/ares_parse_naptr_reply.c',
-        'src/ares_parse_ns_reply.c',
-        'src/ares_parse_ptr_reply.c',
-        'src/ares_parse_soa_reply.c',
-        'src/ares_parse_srv_reply.c',
-        'src/ares_parse_txt_reply.c',
-        'src/ares_platform.h',
-        'src/ares_private.h',
-        'src/ares_process.c',
-        'src/ares_query.c',
-        'src/ares__read_line.c',
-        'src/ares__readaddrinfo.c',
-        'src/ares_search.c',
-        'src/ares_send.c',
-        'src/ares_setup.h',
-        'src/ares__sortaddrinfo.c',
-        'src/ares_strcasecmp.c',
-        'src/ares_strcasecmp.h',
-        'src/ares_strdup.c',
-        'src/ares_strdup.h',
-        'src/ares_strerror.c',
-        'src/ares_strsplit.c',
-        'src/ares_timeout.c',
-        'src/ares__timeval.c',
-        'src/ares_version.c',
-        'src/ares_writev.c',
-        'src/ares_writev.h',
-        'src/bitncmp.c',
-        'src/bitncmp.h',
-        'src/inet_net_pton.c',
-        'src/inet_ntop.c',
-        'src/ares_inet_net_pton.h',
-        'src/setup_once.h',
+        'src/lib/ares_android.c',
+        'src/lib/ares_cancel.c',
+        'src/lib/ares__close_sockets.c',
+        'src/lib/ares_create_query.c',
+        'src/lib/ares_data.c',
+        'src/lib/ares_data.h',
+        'src/lib/ares_destroy.c',
+        'src/lib/ares_expand_name.c',
+        'src/lib/ares_expand_string.c',
+        'src/lib/ares_fds.c',
+        'src/lib/ares_free_hostent.c',
+        'src/lib/ares_free_string.c',
+        'src/lib/ares_freeaddrinfo.c',
+        'src/lib/ares_getenv.h',
+        'src/lib/ares_getaddrinfo.c',
+        'src/lib/ares_gethostbyaddr.c',
+        'src/lib/ares_gethostbyname.c',
+        'src/lib/ares__get_hostent.c',
+        'src/lib/ares_getnameinfo.c',
+        'src/lib/ares_getsock.c',
+        'src/lib/ares_init.c',
+        'src/lib/ares_ipv6.h',
+        'src/lib/ares_library_init.c',
+        'src/lib/ares_library_init.h',
+        'src/lib/ares_llist.c',
+        'src/lib/ares_llist.h',
+        'src/lib/ares_mkquery.c',
+        'src/lib/ares_nowarn.c',
+        'src/lib/ares_nowarn.h',
+        'src/lib/ares_options.c',
+        'src/lib/ares__parse_into_addrinfo.c',
+        'src/lib/ares_parse_aaaa_reply.c',
+        'src/lib/ares_parse_a_reply.c',
+        'src/lib/ares_parse_caa_reply.c',
+        'src/lib/ares_parse_mx_reply.c',
+        'src/lib/ares_parse_naptr_reply.c',
+        'src/lib/ares_parse_ns_reply.c',
+        'src/lib/ares_parse_ptr_reply.c',
+        'src/lib/ares_parse_soa_reply.c',
+        'src/lib/ares_parse_srv_reply.c',
+        'src/lib/ares_parse_txt_reply.c',
+        'src/lib/ares_platform.h',
+        'src/lib/ares_private.h',
+        'src/lib/ares_process.c',
+        'src/lib/ares_query.c',
+        'src/lib/ares__read_line.c',
+        'src/lib/ares__readaddrinfo.c',
+        'src/lib/ares_search.c',
+        'src/lib/ares_send.c',
+        'src/lib/ares_setup.h',
+        'src/lib/ares__sortaddrinfo.c',
+        'src/lib/ares_strcasecmp.c',
+        'src/lib/ares_strcasecmp.h',
+        'src/lib/ares_strdup.c',
+        'src/lib/ares_strdup.h',
+        'src/lib/ares_strerror.c',
+        'src/lib/ares_strsplit.c',
+        'src/lib/ares_timeout.c',
+        'src/lib/ares__timeval.c',
+        'src/lib/ares_version.c',
+        'src/lib/ares_writev.c',
+        'src/lib/ares_writev.h',
+        'src/lib/bitncmp.c',
+        'src/lib/bitncmp.h',
+        'src/lib/inet_net_pton.c',
+        'src/lib/inet_ntop.c',
+        'src/lib/ares_inet_net_pton.h',
+        'src/lib/nameser.h',
+        'src/lib/setup_once.h',
+        'src/tools/ares_getopt.c',
+        'src/tools/ares_getopt.h',
       ],
       'conditions': [
         [ 'library=="static_library"', {
@@ -124,11 +124,11 @@
           ],
           'include_dirs': [ 'config/win32' ],
           'sources': [
-            'src/config-win32.h',
-            'src/windows_port.c',
-            'src/ares_getenv.c',
-            'src/ares_iphlpapi.h',
-            'src/ares_platform.c'
+            'src/lib/config-win32.h',
+            'src/lib/windows_port.c',
+            'src/lib/ares_getenv.c',
+            'src/lib/ares_iphlpapi.h',
+            'src/lib/ares_platform.c'
           ],
           'libraries': [
             '-lws2_32.lib',
diff --git a/deps/cares/src/ares_dns.h b/deps/cares/include/ares_dns.h
index bc8aa7b1091..bc8aa7b1091 100644
--- a/deps/cares/src/ares_dns.h
+++ b/deps/cares/include/ares_dns.h
diff --git a/deps/cares/src/ares__close_sockets.c b/deps/cares/src/lib/ares__close_sockets.c
index 0477174e3e1..0477174e3e1 100644
--- a/deps/cares/src/ares__close_sockets.c
+++ b/deps/cares/src/lib/ares__close_sockets.c
diff --git a/deps/cares/src/ares__get_hostent.c b/deps/cares/src/lib/ares__get_hostent.c
index 367f39037b1..367f39037b1 100644
--- a/deps/cares/src/ares__get_hostent.c
+++ b/deps/cares/src/lib/ares__get_hostent.c
diff --git a/deps/cares/src/ares__parse_into_addrinfo.c b/deps/cares/src/lib/ares__parse_into_addrinfo.c
index b0801632b40..b0801632b40 100644
--- a/deps/cares/src/ares__parse_into_addrinfo.c
+++ b/deps/cares/src/lib/ares__parse_into_addrinfo.c
diff --git a/deps/cares/src/ares__read_line.c b/deps/cares/src/lib/ares__read_line.c
index c62ad2a2b41..c62ad2a2b41 100644
--- a/deps/cares/src/ares__read_line.c
+++ b/deps/cares/src/lib/ares__read_line.c
diff --git a/deps/cares/src/ares__readaddrinfo.c b/deps/cares/src/lib/ares__readaddrinfo.c
index 2b5bb40c3dd..2b5bb40c3dd 100644
--- a/deps/cares/src/ares__readaddrinfo.c
+++ b/deps/cares/src/lib/ares__readaddrinfo.c
diff --git a/deps/cares/src/ares__sortaddrinfo.c b/deps/cares/src/lib/ares__sortaddrinfo.c
index 0ad3a5bd98b..0ad3a5bd98b 100644
--- a/deps/cares/src/ares__sortaddrinfo.c
+++ b/deps/cares/src/lib/ares__sortaddrinfo.c
diff --git a/deps/cares/src/ares__timeval.c b/deps/cares/src/lib/ares__timeval.c
index 94efb7db1e9..94efb7db1e9 100644
--- a/deps/cares/src/ares__timeval.c
+++ b/deps/cares/src/lib/ares__timeval.c
diff --git a/deps/cares/src/ares_android.c b/deps/cares/src/lib/ares_android.c
index 5b00b8065c5..5b00b8065c5 100644
--- a/deps/cares/src/ares_android.c
+++ b/deps/cares/src/lib/ares_android.c
diff --git a/deps/cares/src/ares_android.h b/deps/cares/src/lib/ares_android.h
index 93fb75f5850..93fb75f5850 100644
--- a/deps/cares/src/ares_android.h
+++ b/deps/cares/src/lib/ares_android.h
diff --git a/deps/cares/src/ares_cancel.c b/deps/cares/src/lib/ares_cancel.c
index 465cc9e95ee..465cc9e95ee 100644
--- a/deps/cares/src/ares_cancel.c
+++ b/deps/cares/src/lib/ares_cancel.c
diff --git a/deps/cares/src/ares_create_query.c b/deps/cares/src/lib/ares_create_query.c
index 9efce17cfa3..9efce17cfa3 100644
--- a/deps/cares/src/ares_create_query.c
+++ b/deps/cares/src/lib/ares_create_query.c
diff --git a/deps/cares/src/ares_data.c b/deps/cares/src/lib/ares_data.c
index aa925b8b511..aa925b8b511 100644
--- a/deps/cares/src/ares_data.c
+++ b/deps/cares/src/lib/ares_data.c
diff --git a/deps/cares/src/ares_data.h b/deps/cares/src/lib/ares_data.h
index b0182fd6907..b0182fd6907 100644
--- a/deps/cares/src/ares_data.h
+++ b/deps/cares/src/lib/ares_data.h
diff --git a/deps/cares/src/ares_destroy.c b/deps/cares/src/lib/ares_destroy.c
index fed2009ab32..fed2009ab32 100644
--- a/deps/cares/src/ares_destroy.c
+++ b/deps/cares/src/lib/ares_destroy.c
diff --git a/deps/cares/src/ares_expand_name.c b/deps/cares/src/lib/ares_expand_name.c
index 3a38e6737e9..3a38e6737e9 100644
--- a/deps/cares/src/ares_expand_name.c
+++ b/deps/cares/src/lib/ares_expand_name.c
diff --git a/deps/cares/src/ares_expand_string.c b/deps/cares/src/lib/ares_expand_string.c
index d35df752486..d35df752486 100644
--- a/deps/cares/src/ares_expand_string.c
+++ b/deps/cares/src/lib/ares_expand_string.c
diff --git a/deps/cares/src/ares_fds.c b/deps/cares/src/lib/ares_fds.c
index f405fc047c7..f405fc047c7 100644
--- a/deps/cares/src/ares_fds.c
+++ b/deps/cares/src/lib/ares_fds.c
diff --git a/deps/cares/src/ares_free_hostent.c b/deps/cares/src/lib/ares_free_hostent.c
index cfc5f81feb8..cfc5f81feb8 100644
--- a/deps/cares/src/ares_free_hostent.c
+++ b/deps/cares/src/lib/ares_free_hostent.c
diff --git a/deps/cares/src/ares_free_string.c b/deps/cares/src/lib/ares_free_string.c
index 024992e1c20..024992e1c20 100644
--- a/deps/cares/src/ares_free_string.c
+++ b/deps/cares/src/lib/ares_free_string.c
diff --git a/deps/cares/src/ares_freeaddrinfo.c b/deps/cares/src/lib/ares_freeaddrinfo.c
index 128f5daec4d..128f5daec4d 100644
--- a/deps/cares/src/ares_freeaddrinfo.c
+++ b/deps/cares/src/lib/ares_freeaddrinfo.c
diff --git a/deps/cares/src/ares_getaddrinfo.c b/deps/cares/src/lib/ares_getaddrinfo.c
index ecd5dd5112c..ecd5dd5112c 100644
--- a/deps/cares/src/ares_getaddrinfo.c
+++ b/deps/cares/src/lib/ares_getaddrinfo.c
diff --git a/deps/cares/src/ares_getenv.c b/deps/cares/src/lib/ares_getenv.c
index f6e4dc29526..f6e4dc29526 100644
--- a/deps/cares/src/ares_getenv.c
+++ b/deps/cares/src/lib/ares_getenv.c
diff --git a/deps/cares/src/ares_getenv.h b/deps/cares/src/lib/ares_getenv.h
index 6da6cc5081a..6da6cc5081a 100644
--- a/deps/cares/src/ares_getenv.h
+++ b/deps/cares/src/lib/ares_getenv.h
diff --git a/deps/cares/src/ares_gethostbyaddr.c b/deps/cares/src/lib/ares_gethostbyaddr.c
index 54eb5997392..54eb5997392 100644
--- a/deps/cares/src/ares_gethostbyaddr.c
+++ b/deps/cares/src/lib/ares_gethostbyaddr.c
diff --git a/deps/cares/src/ares_gethostbyname.c b/deps/cares/src/lib/ares_gethostbyname.c
index 4e41898496f..4e41898496f 100644
--- a/deps/cares/src/ares_gethostbyname.c
+++ b/deps/cares/src/lib/ares_gethostbyname.c
diff --git a/deps/cares/src/ares_getnameinfo.c b/deps/cares/src/lib/ares_getnameinfo.c
index 53f91ca8459..53f91ca8459 100644
--- a/deps/cares/src/ares_getnameinfo.c
+++ b/deps/cares/src/lib/ares_getnameinfo.c
diff --git a/deps/cares/src/ares_getsock.c b/deps/cares/src/lib/ares_getsock.c
index 22d344679fa..22d344679fa 100644
--- a/deps/cares/src/ares_getsock.c
+++ b/deps/cares/src/lib/ares_getsock.c
diff --git a/deps/cares/src/ares_inet_net_pton.h b/deps/cares/src/lib/ares_inet_net_pton.h
index 90da2cc6514..90da2cc6514 100644
--- a/deps/cares/src/ares_inet_net_pton.h
+++ b/deps/cares/src/lib/ares_inet_net_pton.h
diff --git a/deps/cares/src/ares_init.c b/deps/cares/src/lib/ares_init.c
index 92187e463e6..92187e463e6 100644
--- a/deps/cares/src/ares_init.c
+++ b/deps/cares/src/lib/ares_init.c
diff --git a/deps/cares/src/ares_iphlpapi.h b/deps/cares/src/lib/ares_iphlpapi.h
index 343aee3ffbd..343aee3ffbd 100644
--- a/deps/cares/src/ares_iphlpapi.h
+++ b/deps/cares/src/lib/ares_iphlpapi.h
diff --git a/deps/cares/src/ares_ipv6.h b/deps/cares/src/lib/ares_ipv6.h
index fdbc21fe8f9..fdbc21fe8f9 100644
--- a/deps/cares/src/ares_ipv6.h
+++ b/deps/cares/src/lib/ares_ipv6.h
diff --git a/deps/cares/src/ares_library_init.c b/deps/cares/src/lib/ares_library_init.c
index 67563499bec..67563499bec 100644
--- a/deps/cares/src/ares_library_init.c
+++ b/deps/cares/src/lib/ares_library_init.c
diff --git a/deps/cares/src/ares_library_init.h b/deps/cares/src/lib/ares_library_init.h
index 2a2ba118b5f..2a2ba118b5f 100644
--- a/deps/cares/src/ares_library_init.h
+++ b/deps/cares/src/lib/ares_library_init.h
diff --git a/deps/cares/src/ares_llist.c b/deps/cares/src/lib/ares_llist.c
index 36ca84c43e4..36ca84c43e4 100644
--- a/deps/cares/src/ares_llist.c
+++ b/deps/cares/src/lib/ares_llist.c
diff --git a/deps/cares/src/ares_llist.h b/deps/cares/src/lib/ares_llist.h
index 20f4d1ce426..20f4d1ce426 100644
--- a/deps/cares/src/ares_llist.h
+++ b/deps/cares/src/lib/ares_llist.h
diff --git a/deps/cares/src/ares_mkquery.c b/deps/cares/src/lib/ares_mkquery.c
index 5aea914bd0e..5aea914bd0e 100644
--- a/deps/cares/src/ares_mkquery.c
+++ b/deps/cares/src/lib/ares_mkquery.c
diff --git a/deps/cares/src/ares_nowarn.c b/deps/cares/src/lib/ares_nowarn.c
index f63d9135ecc..f63d9135ecc 100644
--- a/deps/cares/src/ares_nowarn.c
+++ b/deps/cares/src/lib/ares_nowarn.c
diff --git a/deps/cares/src/ares_nowarn.h b/deps/cares/src/lib/ares_nowarn.h
index 505e6220981..505e6220981 100644
--- a/deps/cares/src/ares_nowarn.h
+++ b/deps/cares/src/lib/ares_nowarn.h
diff --git a/deps/cares/src/ares_options.c b/deps/cares/src/lib/ares_options.c
index de49de46259..de49de46259 100644
--- a/deps/cares/src/ares_options.c
+++ b/deps/cares/src/lib/ares_options.c
diff --git a/deps/cares/src/ares_parse_a_reply.c b/deps/cares/src/lib/ares_parse_a_reply.c
index e71c993f8de..e71c993f8de 100644
--- a/deps/cares/src/ares_parse_a_reply.c
+++ b/deps/cares/src/lib/ares_parse_a_reply.c
diff --git a/deps/cares/src/ares_parse_aaaa_reply.c b/deps/cares/src/lib/ares_parse_aaaa_reply.c
index 346d430750b..346d430750b 100644
--- a/deps/cares/src/ares_parse_aaaa_reply.c
+++ b/deps/cares/src/lib/ares_parse_aaaa_reply.c
diff --git a/deps/cares/src/ares_parse_caa_reply.c b/deps/cares/src/lib/ares_parse_caa_reply.c
index 620f444e007..620f444e007 100644
--- a/deps/cares/src/ares_parse_caa_reply.c
+++ b/deps/cares/src/lib/ares_parse_caa_reply.c
diff --git a/deps/cares/src/ares_parse_mx_reply.c b/deps/cares/src/lib/ares_parse_mx_reply.c
index e6336473e0a..e6336473e0a 100644
--- a/deps/cares/src/ares_parse_mx_reply.c
+++ b/deps/cares/src/lib/ares_parse_mx_reply.c
diff --git a/deps/cares/src/ares_parse_naptr_reply.c b/deps/cares/src/lib/ares_parse_naptr_reply.c
index a14c226a9e7..a14c226a9e7 100644
--- a/deps/cares/src/ares_parse_naptr_reply.c
+++ b/deps/cares/src/lib/ares_parse_naptr_reply.c
diff --git a/deps/cares/src/ares_parse_ns_reply.c b/deps/cares/src/lib/ares_parse_ns_reply.c
index 7bb51429db0..7bb51429db0 100644
--- a/deps/cares/src/ares_parse_ns_reply.c
+++ b/deps/cares/src/lib/ares_parse_ns_reply.c
diff --git a/deps/cares/src/ares_parse_ptr_reply.c b/deps/cares/src/lib/ares_parse_ptr_reply.c
index 29e22cb17b6..29e22cb17b6 100644
--- a/deps/cares/src/ares_parse_ptr_reply.c
+++ b/deps/cares/src/lib/ares_parse_ptr_reply.c
diff --git a/deps/cares/src/ares_parse_soa_reply.c b/deps/cares/src/lib/ares_parse_soa_reply.c
index 7cfaed2b333..7cfaed2b333 100644
--- a/deps/cares/src/ares_parse_soa_reply.c
+++ b/deps/cares/src/lib/ares_parse_soa_reply.c
diff --git a/deps/cares/src/ares_parse_srv_reply.c b/deps/cares/src/lib/ares_parse_srv_reply.c
index 824ff3aedf0..824ff3aedf0 100644
--- a/deps/cares/src/ares_parse_srv_reply.c
+++ b/deps/cares/src/lib/ares_parse_srv_reply.c
diff --git a/deps/cares/src/ares_parse_txt_reply.c b/deps/cares/src/lib/ares_parse_txt_reply.c
index 3f47e23f086..3f47e23f086 100644
--- a/deps/cares/src/ares_parse_txt_reply.c
+++ b/deps/cares/src/lib/ares_parse_txt_reply.c
diff --git a/deps/cares/src/ares_platform.c b/deps/cares/src/lib/ares_platform.c
index 6c749dccb24..6c749dccb24 100644
--- a/deps/cares/src/ares_platform.c
+++ b/deps/cares/src/lib/ares_platform.c
diff --git a/deps/cares/src/ares_platform.h b/deps/cares/src/lib/ares_platform.h
index e6885ae5461..e6885ae5461 100644
--- a/deps/cares/src/ares_platform.h
+++ b/deps/cares/src/lib/ares_platform.h
diff --git a/deps/cares/src/ares_private.h b/deps/cares/src/lib/ares_private.h
index 50b2ba06e15..50b2ba06e15 100644
--- a/deps/cares/src/ares_private.h
+++ b/deps/cares/src/lib/ares_private.h
diff --git a/deps/cares/src/ares_process.c b/deps/cares/src/lib/ares_process.c
index 65c1b7ff1a8..65c1b7ff1a8 100644
--- a/deps/cares/src/ares_process.c
+++ b/deps/cares/src/lib/ares_process.c
diff --git a/deps/cares/src/ares_query.c b/deps/cares/src/lib/ares_query.c
index 5bbb2f5c326..5bbb2f5c326 100644
--- a/deps/cares/src/ares_query.c
+++ b/deps/cares/src/lib/ares_query.c
diff --git a/deps/cares/src/ares_search.c b/deps/cares/src/lib/ares_search.c
index c4b0424f5ba..c4b0424f5ba 100644
--- a/deps/cares/src/ares_search.c
+++ b/deps/cares/src/lib/ares_search.c
diff --git a/deps/cares/src/ares_send.c b/deps/cares/src/lib/ares_send.c
index f4f1f951197..f4f1f951197 100644
--- a/deps/cares/src/ares_send.c
+++ b/deps/cares/src/lib/ares_send.c
diff --git a/deps/cares/src/ares_setup.h b/deps/cares/src/lib/ares_setup.h
index 4df796116a0..4df796116a0 100644
--- a/deps/cares/src/ares_setup.h
+++ b/deps/cares/src/lib/ares_setup.h
diff --git a/deps/cares/src/ares_strcasecmp.c b/deps/cares/src/lib/ares_strcasecmp.c
index f9c85e20966..f9c85e20966 100644
--- a/deps/cares/src/ares_strcasecmp.c
+++ b/deps/cares/src/lib/ares_strcasecmp.c
diff --git a/deps/cares/src/ares_strcasecmp.h b/deps/cares/src/lib/ares_strcasecmp.h
index 57d86f96342..57d86f96342 100644
--- a/deps/cares/src/ares_strcasecmp.h
+++ b/deps/cares/src/lib/ares_strcasecmp.h
diff --git a/deps/cares/src/ares_strdup.c b/deps/cares/src/lib/ares_strdup.c
index 0c3dcffc30d..0c3dcffc30d 100644
--- a/deps/cares/src/ares_strdup.c
+++ b/deps/cares/src/lib/ares_strdup.c
diff --git a/deps/cares/src/ares_strdup.h b/deps/cares/src/lib/ares_strdup.h
index 67f2a74f5f1..67f2a74f5f1 100644
--- a/deps/cares/src/ares_strdup.h
+++ b/deps/cares/src/lib/ares_strdup.h
diff --git a/deps/cares/src/ares_strerror.c b/deps/cares/src/lib/ares_strerror.c
index c3ecbd7b43c..c3ecbd7b43c 100644
--- a/deps/cares/src/ares_strerror.c
+++ b/deps/cares/src/lib/ares_strerror.c
diff --git a/deps/cares/src/ares_strsplit.c b/deps/cares/src/lib/ares_strsplit.c
index b57a30f2a99..b57a30f2a99 100644
--- a/deps/cares/src/ares_strsplit.c
+++ b/deps/cares/src/lib/ares_strsplit.c
diff --git a/deps/cares/src/ares_strsplit.h b/deps/cares/src/lib/ares_strsplit.h
index e00fd14dd5a..e00fd14dd5a 100644
--- a/deps/cares/src/ares_strsplit.h
+++ b/deps/cares/src/lib/ares_strsplit.h
diff --git a/deps/cares/src/ares_timeout.c b/deps/cares/src/lib/ares_timeout.c
index 293e4af0216..293e4af0216 100644
--- a/deps/cares/src/ares_timeout.c
+++ b/deps/cares/src/lib/ares_timeout.c
diff --git a/deps/cares/src/ares_version.c b/deps/cares/src/lib/ares_version.c
index 4f8c42f2c9a..4f8c42f2c9a 100644
--- a/deps/cares/src/ares_version.c
+++ b/deps/cares/src/lib/ares_version.c
diff --git a/deps/cares/src/ares_writev.c b/deps/cares/src/lib/ares_writev.c
index e812c09e1c5..e812c09e1c5 100644
--- a/deps/cares/src/ares_writev.c
+++ b/deps/cares/src/lib/ares_writev.c
diff --git a/deps/cares/src/ares_writev.h b/deps/cares/src/lib/ares_writev.h
index 65cea8708fc..65cea8708fc 100644
--- a/deps/cares/src/ares_writev.h
+++ b/deps/cares/src/lib/ares_writev.h
diff --git a/deps/cares/src/bitncmp.c b/deps/cares/src/lib/bitncmp.c
index 1468d4923a5..1468d4923a5 100644
--- a/deps/cares/src/bitncmp.c
+++ b/deps/cares/src/lib/bitncmp.c
diff --git a/deps/cares/src/bitncmp.h b/deps/cares/src/lib/bitncmp.h
index 7b8d66c1662..7b8d66c1662 100644
--- a/deps/cares/src/bitncmp.h
+++ b/deps/cares/src/lib/bitncmp.h
diff --git a/deps/cares/src/config-win32.h b/deps/cares/src/lib/config-win32.h
index cc8e4430a49..cc8e4430a49 100644
--- a/deps/cares/src/config-win32.h
+++ b/deps/cares/src/lib/config-win32.h
diff --git a/deps/cares/src/inet_net_pton.c b/deps/cares/src/lib/inet_net_pton.c
index af1a534a05a..af1a534a05a 100644
--- a/deps/cares/src/inet_net_pton.c
+++ b/deps/cares/src/lib/inet_net_pton.c
diff --git a/deps/cares/src/inet_ntop.c b/deps/cares/src/lib/inet_ntop.c
index 1935a871ced..1935a871ced 100644
--- a/deps/cares/src/inet_ntop.c
+++ b/deps/cares/src/lib/inet_ntop.c
diff --git a/deps/cares/include/nameser.h b/deps/cares/src/lib/nameser.h
index 5c1acce2155..5c1acce2155 100644
--- a/deps/cares/include/nameser.h
+++ b/deps/cares/src/lib/nameser.h
diff --git a/deps/cares/src/setup_once.h b/deps/cares/src/lib/setup_once.h
index a8cfe6beccd..a8cfe6beccd 100644
--- a/deps/cares/src/setup_once.h
+++ b/deps/cares/src/lib/setup_once.h
diff --git a/deps/cares/src/windows_port.c b/deps/cares/src/lib/windows_port.c
index 03acd1c1e2b..03acd1c1e2b 100644
--- a/deps/cares/src/windows_port.c
+++ b/deps/cares/src/lib/windows_port.c
diff --git a/deps/cares/src/ares_getopt.c b/deps/cares/src/tools/ares_getopt.c
index 1e02d086866..1e02d086866 100644
--- a/deps/cares/src/ares_getopt.c
+++ b/deps/cares/src/tools/ares_getopt.c
diff --git a/deps/cares/src/ares_getopt.h b/deps/cares/src/tools/ares_getopt.h
index 63acb3b4232..63acb3b4232 100644
--- a/deps/cares/src/ares_getopt.h
+++ b/deps/cares/src/tools/ares_getopt.h