diff --git a/BUILD b/BUILD
index ec750bcef411efdf9d82aead086ecc7ab04d2a89..c030f24cd7c883cad4a9dac478a430e1d09e25b0 100644
--- a/BUILD
+++ b/BUILD
@@ -1,4 +1,3 @@
-# gRPC Bazel BUILD file.
 #
 # Copyright 2016, Google Inc.
 # All rights reserved.
@@ -437,6 +436,7 @@ grpc_cc_library(
         "src/core/lib/iomgr/combiner.c",
         "src/core/lib/iomgr/endpoint.c",
         "src/core/lib/iomgr/endpoint_pair_posix.c",
+        "src/core/lib/iomgr/endpoint_pair_uv.c",
         "src/core/lib/iomgr/endpoint_pair_windows.c",
         "src/core/lib/iomgr/error.c",
         "src/core/lib/iomgr/ev_epoll_linux.c",
@@ -468,7 +468,6 @@ grpc_cc_library(
         "src/core/lib/iomgr/tcp_server_windows.c",
         "src/core/lib/iomgr/tcp_windows.c",
         "src/core/lib/iomgr/time_averaged_stats.c",
-        "src/core/lib/iomgr/timer.c",
         "src/core/lib/iomgr/timer_heap.c",
         "src/core/lib/iomgr/udp_server.c",
         "src/core/lib/iomgr/unix_sockets_posix.c",
@@ -549,27 +548,34 @@ grpc_cc_library(
         "src/core/lib/iomgr/pollset.h",
         "src/core/lib/iomgr/pollset_set.h",
         "src/core/lib/iomgr/pollset_set_windows.h",
+        "src/core/lib/iomgr/pollset_uv.h",
         "src/core/lib/iomgr/pollset_windows.h",
+        "src/core/lib/iomgr/port.h",
         "src/core/lib/iomgr/resolve_address.h",
         "src/core/lib/iomgr/sockaddr.h",
         "src/core/lib/iomgr/sockaddr_posix.h",
         "src/core/lib/iomgr/sockaddr_utils.h",
         "src/core/lib/iomgr/sockaddr_windows.h",
+        "src/core/lib/iomgr/socket_utils.h",
         "src/core/lib/iomgr/socket_utils_posix.h",
         "src/core/lib/iomgr/socket_windows.h",
         "src/core/lib/iomgr/tcp_client.h",
         "src/core/lib/iomgr/tcp_posix.h",
         "src/core/lib/iomgr/tcp_server.h",
+        "src/core/lib/iomgr/tcp_uv.h",
         "src/core/lib/iomgr/tcp_windows.h",
         "src/core/lib/iomgr/time_averaged_stats.h",
         "src/core/lib/iomgr/timer.h",
+        "src/core/lib/iomgr/timer_generic.h",
         "src/core/lib/iomgr/timer_heap.h",
+        "src/core/lib/iomgr/timer_uv.h",
         "src/core/lib/iomgr/udp_server.h",
         "src/core/lib/iomgr/unix_sockets_posix.h",
         "src/core/lib/iomgr/wakeup_fd_cv.h",
         "src/core/lib/iomgr/wakeup_fd_pipe.h",
         "src/core/lib/iomgr/wakeup_fd_posix.h",
         "src/core/lib/iomgr/workqueue.h",
+        "src/core/lib/iomgr/workqueue_uv.h",
         "src/core/lib/iomgr/workqueue_windows.h",
         "src/core/lib/json/json.h",
         "src/core/lib/json/json_common.h",
@@ -591,7 +597,7 @@ grpc_cc_library(
         "src/core/lib/transport/mdstr_hash_table.h",
         "src/core/lib/transport/metadata.h",
         "src/core/lib/transport/metadata_batch.h",
-        "src/core/lib/transport/static_metadata.h",
+        "src/core/lib/transport/method_config.h",
         "src/core/lib/transport/timeout_encoding.h",
         "src/core/lib/transport/transport.h",
         "src/core/lib/transport/transport_impl.h",
@@ -618,47 +624,10 @@ grpc_cc_library(
 grpc_cc_library(
     name = "grpc_client_config",
     srcs = [
-        "src/core/ext/client_config/channel_connectivity.c",
-        "src/core/ext/client_config/client_channel.c",
-        "src/core/ext/client_config/client_channel_factory.c",
-        "src/core/ext/client_config/client_config_plugin.c",
-        "src/core/ext/client_config/connector.c",
-        "src/core/ext/client_config/default_initial_connect_string.c",
-        "src/core/ext/client_config/http_connect_handshaker.c",
-        "src/core/ext/client_config/initial_connect_string.c",
-        "src/core/ext/client_config/lb_policy.c",
-        "src/core/ext/client_config/lb_policy_factory.c",
-        "src/core/ext/client_config/lb_policy_registry.c",
         "src/core/ext/client_config/message_size_filter.c",
-        "src/core/ext/client_config/method_config.c",
-        "src/core/ext/client_config/parse_address.c",
-        "src/core/ext/client_config/resolver.c",
-        "src/core/ext/client_config/resolver_factory.c",
-        "src/core/ext/client_config/resolver_registry.c",
-        "src/core/ext/client_config/resolver_result.c",
-        "src/core/ext/client_config/subchannel.c",
-        "src/core/ext/client_config/subchannel_index.c",
-        "src/core/ext/client_config/uri_parser.c",
     ],
     hdrs = [
-        "src/core/ext/client_config/client_channel.h",
-        "src/core/ext/client_config/client_channel_factory.h",
-        "src/core/ext/client_config/connector.h",
-        "src/core/ext/client_config/http_connect_handshaker.h",
-        "src/core/ext/client_config/initial_connect_string.h",
-        "src/core/ext/client_config/lb_policy.h",
-        "src/core/ext/client_config/lb_policy_factory.h",
-        "src/core/ext/client_config/lb_policy_registry.h",
         "src/core/ext/client_config/message_size_filter.h",
-        "src/core/ext/client_config/method_config.h",
-        "src/core/ext/client_config/parse_address.h",
-        "src/core/ext/client_config/resolver.h",
-        "src/core/ext/client_config/resolver_factory.h",
-        "src/core/ext/client_config/resolver_registry.h",
-        "src/core/ext/client_config/resolver_result.h",
-        "src/core/ext/client_config/subchannel.h",
-        "src/core/ext/client_config/subchannel_index.h",
-        "src/core/ext/client_config/uri_parser.h",
     ],
     language = "c",
     deps = [
@@ -777,8 +746,6 @@ grpc_cc_library(
         "src/core/lib/security/credentials/credentials.c",
         "src/core/lib/security/credentials/credentials_metadata.c",
         "src/core/lib/security/credentials/fake/fake_credentials.c",
-        "src/core/lib/security/credentials/google_default/credentials_posix.c",
-        "src/core/lib/security/credentials/google_default/credentials_windows.c",
         "src/core/lib/security/credentials/google_default/google_default_credentials.c",
         "src/core/lib/security/credentials/iam/iam_credentials.c",
         "src/core/lib/security/credentials/jwt/json_token.c",