diff --git a/build/source_list.bzl b/build/source_list.bzl
index 808114a..62ed564 100644
--- a/build/source_list.bzl
+++ b/build/source_list.bzl
@@ -136,6 +136,7 @@
     "quic/core/congestion_control/tcp_cubic_sender_bytes.h",
     "quic/core/congestion_control/uber_loss_algorithm.h",
     "quic/core/congestion_control/windowed_filter.h",
+    "quic/core/connecting_client_socket.h",
     "quic/core/connection_id_generator.h",
     "quic/core/crypto/aead_base_decrypter.h",
     "quic/core/crypto/aead_base_encrypter.h",
@@ -343,6 +344,7 @@
     "quic/core/quic_versions.h",
     "quic/core/quic_write_blocked_list.h",
     "quic/core/session_notifier_interface.h",
+    "quic/core/socket_factory.h",
     "quic/core/stream_delegate_interface.h",
     "quic/core/tls_chlo_extractor.h",
     "quic/core/tls_client_handshaker.h",
@@ -953,14 +955,12 @@
     "quic/core/batch_writer/quic_batch_writer_test.h",
     "quic/core/batch_writer/quic_gso_batch_writer.h",
     "quic/core/batch_writer/quic_sendmmsg_batch_writer.h",
-    "quic/core/io/connecting_client_socket.h",
     "quic/core/io/event_loop_socket_factory.h",
     "quic/core/io/event_loop_tcp_client_socket.h",
     "quic/core/io/quic_default_event_loop.h",
     "quic/core/io/quic_event_loop.h",
     "quic/core/io/quic_poll_event_loop.h",
     "quic/core/io/socket.h",
-    "quic/core/io/socket_factory.h",
     "quic/core/quic_default_packet_writer.h",
     "quic/core/quic_linux_socket_utils.h",
     "quic/core/quic_packet_reader.h",
diff --git a/build/source_list.gni b/build/source_list.gni
index a03ebc5..49da9aa 100644
--- a/build/source_list.gni
+++ b/build/source_list.gni
@@ -136,6 +136,7 @@
     "src/quiche/quic/core/congestion_control/tcp_cubic_sender_bytes.h",
     "src/quiche/quic/core/congestion_control/uber_loss_algorithm.h",
     "src/quiche/quic/core/congestion_control/windowed_filter.h",
+    "src/quiche/quic/core/connecting_client_socket.h",
     "src/quiche/quic/core/connection_id_generator.h",
     "src/quiche/quic/core/crypto/aead_base_decrypter.h",
     "src/quiche/quic/core/crypto/aead_base_encrypter.h",
@@ -343,6 +344,7 @@
     "src/quiche/quic/core/quic_versions.h",
     "src/quiche/quic/core/quic_write_blocked_list.h",
     "src/quiche/quic/core/session_notifier_interface.h",
+    "src/quiche/quic/core/socket_factory.h",
     "src/quiche/quic/core/stream_delegate_interface.h",
     "src/quiche/quic/core/tls_chlo_extractor.h",
     "src/quiche/quic/core/tls_client_handshaker.h",
@@ -953,14 +955,12 @@
     "src/quiche/quic/core/batch_writer/quic_batch_writer_test.h",
     "src/quiche/quic/core/batch_writer/quic_gso_batch_writer.h",
     "src/quiche/quic/core/batch_writer/quic_sendmmsg_batch_writer.h",
-    "src/quiche/quic/core/io/connecting_client_socket.h",
     "src/quiche/quic/core/io/event_loop_socket_factory.h",
     "src/quiche/quic/core/io/event_loop_tcp_client_socket.h",
     "src/quiche/quic/core/io/quic_default_event_loop.h",
     "src/quiche/quic/core/io/quic_event_loop.h",
     "src/quiche/quic/core/io/quic_poll_event_loop.h",
     "src/quiche/quic/core/io/socket.h",
-    "src/quiche/quic/core/io/socket_factory.h",
     "src/quiche/quic/core/quic_default_packet_writer.h",
     "src/quiche/quic/core/quic_linux_socket_utils.h",
     "src/quiche/quic/core/quic_packet_reader.h",
diff --git a/build/source_list.json b/build/source_list.json
index cf5abb2..6d59023 100644
--- a/build/source_list.json
+++ b/build/source_list.json
@@ -135,6 +135,7 @@
     "quiche/quic/core/congestion_control/tcp_cubic_sender_bytes.h",
     "quiche/quic/core/congestion_control/uber_loss_algorithm.h",
     "quiche/quic/core/congestion_control/windowed_filter.h",
+    "quiche/quic/core/connecting_client_socket.h",
     "quiche/quic/core/connection_id_generator.h",
     "quiche/quic/core/crypto/aead_base_decrypter.h",
     "quiche/quic/core/crypto/aead_base_encrypter.h",
@@ -342,6 +343,7 @@
     "quiche/quic/core/quic_versions.h",
     "quiche/quic/core/quic_write_blocked_list.h",
     "quiche/quic/core/session_notifier_interface.h",
+    "quiche/quic/core/socket_factory.h",
     "quiche/quic/core/stream_delegate_interface.h",
     "quiche/quic/core/tls_chlo_extractor.h",
     "quiche/quic/core/tls_client_handshaker.h",
@@ -952,14 +954,12 @@
     "quiche/quic/core/batch_writer/quic_batch_writer_test.h",
     "quiche/quic/core/batch_writer/quic_gso_batch_writer.h",
     "quiche/quic/core/batch_writer/quic_sendmmsg_batch_writer.h",
-    "quiche/quic/core/io/connecting_client_socket.h",
     "quiche/quic/core/io/event_loop_socket_factory.h",
     "quiche/quic/core/io/event_loop_tcp_client_socket.h",
     "quiche/quic/core/io/quic_default_event_loop.h",
     "quiche/quic/core/io/quic_event_loop.h",
     "quiche/quic/core/io/quic_poll_event_loop.h",
     "quiche/quic/core/io/socket.h",
-    "quiche/quic/core/io/socket_factory.h",
     "quiche/quic/core/quic_default_packet_writer.h",
     "quiche/quic/core/quic_linux_socket_utils.h",
     "quiche/quic/core/quic_packet_reader.h",
diff --git a/quiche/quic/core/io/connecting_client_socket.h b/quiche/quic/core/connecting_client_socket.h
similarity index 95%
rename from quiche/quic/core/io/connecting_client_socket.h
rename to quiche/quic/core/connecting_client_socket.h
index 930300b..01c27dd 100644
--- a/quiche/quic/core/io/connecting_client_socket.h
+++ b/quiche/quic/core/connecting_client_socket.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef QUICHE_QUIC_CORE_IO_CONNECTING_CLIENT_SOCKET_H_
-#define QUICHE_QUIC_CORE_IO_CONNECTING_CLIENT_SOCKET_H_
+#ifndef QUICHE_QUIC_CORE_CONNECTING_CLIENT_SOCKET_H_
+#define QUICHE_QUIC_CORE_CONNECTING_CLIENT_SOCKET_H_
 
 #include <string>
 
@@ -104,4 +104,4 @@
 
 }  // namespace quic
 
-#endif  // QUICHE_QUIC_CORE_IO_CONNECTING_CLIENT_SOCKET_H_
+#endif  // QUICHE_QUIC_CORE_CONNECTING_CLIENT_SOCKET_H_
diff --git a/quiche/quic/core/io/event_loop_socket_factory.cc b/quiche/quic/core/io/event_loop_socket_factory.cc
index b403c6b..643efab 100644
--- a/quiche/quic/core/io/event_loop_socket_factory.cc
+++ b/quiche/quic/core/io/event_loop_socket_factory.cc
@@ -6,7 +6,7 @@
 
 #include <memory>
 
-#include "quiche/quic/core/io/connecting_client_socket.h"
+#include "quiche/quic/core/connecting_client_socket.h"
 #include "quiche/quic/core/io/event_loop_tcp_client_socket.h"
 #include "quiche/quic/core/io/quic_event_loop.h"
 #include "quiche/quic/core/quic_types.h"
diff --git a/quiche/quic/core/io/event_loop_socket_factory.h b/quiche/quic/core/io/event_loop_socket_factory.h
index 03ab856..e3654f9 100644
--- a/quiche/quic/core/io/event_loop_socket_factory.h
+++ b/quiche/quic/core/io/event_loop_socket_factory.h
@@ -7,10 +7,10 @@
 
 #include <memory>
 
-#include "quiche/quic/core/io/connecting_client_socket.h"
+#include "quiche/quic/core/connecting_client_socket.h"
 #include "quiche/quic/core/io/quic_event_loop.h"
-#include "quiche/quic/core/io/socket_factory.h"
 #include "quiche/quic/core/quic_types.h"
+#include "quiche/quic/core/socket_factory.h"
 #include "quiche/quic/platform/api/quic_socket_address.h"
 #include "quiche/common/platform/api/quiche_export.h"
 #include "quiche/common/quiche_buffer_allocator.h"
diff --git a/quiche/quic/core/io/event_loop_tcp_client_socket.h b/quiche/quic/core/io/event_loop_tcp_client_socket.h
index 4d4e515..213aac2 100644
--- a/quiche/quic/core/io/event_loop_tcp_client_socket.h
+++ b/quiche/quic/core/io/event_loop_tcp_client_socket.h
@@ -11,7 +11,7 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
-#include "quiche/quic/core/io/connecting_client_socket.h"
+#include "quiche/quic/core/connecting_client_socket.h"
 #include "quiche/quic/core/io/quic_event_loop.h"
 #include "quiche/quic/core/quic_types.h"
 #include "quiche/quic/platform/api/quic_socket_address.h"
diff --git a/quiche/quic/core/io/event_loop_tcp_client_socket_test.cc b/quiche/quic/core/io/event_loop_tcp_client_socket_test.cc
index cbf724e..68343a5 100644
--- a/quiche/quic/core/io/event_loop_tcp_client_socket_test.cc
+++ b/quiche/quic/core/io/event_loop_tcp_client_socket_test.cc
@@ -15,7 +15,7 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "absl/types/span.h"
-#include "quiche/quic/core/io/connecting_client_socket.h"
+#include "quiche/quic/core/connecting_client_socket.h"
 #include "quiche/quic/core/io/event_loop_socket_factory.h"
 #include "quiche/quic/core/io/quic_default_event_loop.h"
 #include "quiche/quic/core/io/quic_event_loop.h"
diff --git a/quiche/quic/core/io/socket_factory.h b/quiche/quic/core/socket_factory.h
similarity index 84%
rename from quiche/quic/core/io/socket_factory.h
rename to quiche/quic/core/socket_factory.h
index 36ea666..4c473dc 100644
--- a/quiche/quic/core/io/socket_factory.h
+++ b/quiche/quic/core/socket_factory.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef QUICHE_QUIC_CORE_IO_SOCKET_FACTORY_H_
-#define QUICHE_QUIC_CORE_IO_SOCKET_FACTORY_H_
+#ifndef QUICHE_QUIC_CORE_SOCKET_FACTORY_H_
+#define QUICHE_QUIC_CORE_SOCKET_FACTORY_H_
 
 #include <memory>
 
-#include "quiche/quic/core/io/connecting_client_socket.h"
+#include "quiche/quic/core/connecting_client_socket.h"
 #include "quiche/quic/core/quic_types.h"
 #include "quiche/quic/platform/api/quic_socket_address.h"
 #include "quiche/common/platform/api/quiche_export.h"
@@ -31,4 +31,4 @@
 
 }  // namespace quic
 
-#endif  // QUICHE_QUIC_CORE_IO_SOCKET_FACTORY_H_
+#endif  // QUICHE_QUIC_CORE_SOCKET_FACTORY_H_
diff --git a/quiche/quic/tools/connect_server_backend.cc b/quiche/quic/tools/connect_server_backend.cc
index f54e6ab..646f575 100644
--- a/quiche/quic/tools/connect_server_backend.cc
+++ b/quiche/quic/tools/connect_server_backend.cc
@@ -10,8 +10,8 @@
 
 #include "absl/container/flat_hash_set.h"
 #include "absl/strings/string_view.h"
-#include "quiche/quic/core/io/socket_factory.h"
 #include "quiche/quic/core/quic_server_id.h"
+#include "quiche/quic/core/socket_factory.h"
 #include "quiche/quic/tools/connect_tunnel.h"
 #include "quiche/quic/tools/quic_simple_server_backend.h"
 #include "quiche/common/platform/api/quiche_bug_tracker.h"
diff --git a/quiche/quic/tools/connect_server_backend.h b/quiche/quic/tools/connect_server_backend.h
index 74a21e2..10eb7c5 100644
--- a/quiche/quic/tools/connect_server_backend.h
+++ b/quiche/quic/tools/connect_server_backend.h
@@ -12,8 +12,8 @@
 
 #include "absl/container/flat_hash_map.h"
 #include "absl/container/flat_hash_set.h"
-#include "quiche/quic/core/io/socket_factory.h"
 #include "quiche/quic/core/quic_server_id.h"
+#include "quiche/quic/core/socket_factory.h"
 #include "quiche/quic/tools/connect_tunnel.h"
 #include "quiche/quic/tools/quic_simple_server_backend.h"
 
diff --git a/quiche/quic/tools/connect_tunnel.cc b/quiche/quic/tools/connect_tunnel.cc
index 4a31f12..d31e540 100644
--- a/quiche/quic/tools/connect_tunnel.cc
+++ b/quiche/quic/tools/connect_tunnel.cc
@@ -16,9 +16,9 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "absl/types/span.h"
-#include "quiche/quic/core/io/socket_factory.h"
 #include "quiche/quic/core/quic_error_codes.h"
 #include "quiche/quic/core/quic_server_id.h"
+#include "quiche/quic/core/socket_factory.h"
 #include "quiche/quic/platform/api/quic_socket_address.h"
 #include "quiche/quic/tools/quic_backend_response.h"
 #include "quiche/quic/tools/quic_name_lookup.h"
diff --git a/quiche/quic/tools/connect_tunnel.h b/quiche/quic/tools/connect_tunnel.h
index 7cc9bbf..259f125 100644
--- a/quiche/quic/tools/connect_tunnel.h
+++ b/quiche/quic/tools/connect_tunnel.h
@@ -14,10 +14,10 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-#include "quiche/quic/core/io/connecting_client_socket.h"
-#include "quiche/quic/core/io/socket_factory.h"
+#include "quiche/quic/core/connecting_client_socket.h"
 #include "quiche/quic/core/quic_error_codes.h"
 #include "quiche/quic/core/quic_server_id.h"
+#include "quiche/quic/core/socket_factory.h"
 #include "quiche/quic/tools/quic_simple_server_backend.h"
 #include "quiche/common/platform/api/quiche_mem_slice.h"
 #include "quiche/spdy/core/http2_header_block.h"
diff --git a/quiche/quic/tools/connect_tunnel_test.cc b/quiche/quic/tools/connect_tunnel_test.cc
index 4492c7a..cb91e42 100644
--- a/quiche/quic/tools/connect_tunnel_test.cc
+++ b/quiche/quic/tools/connect_tunnel_test.cc
@@ -12,11 +12,11 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
-#include "quiche/quic/core/io/connecting_client_socket.h"
-#include "quiche/quic/core/io/socket_factory.h"
+#include "quiche/quic/core/connecting_client_socket.h"
 #include "quiche/quic/core/quic_connection_id.h"
 #include "quiche/quic/core/quic_error_codes.h"
 #include "quiche/quic/core/quic_types.h"
+#include "quiche/quic/core/socket_factory.h"
 #include "quiche/quic/platform/api/quic_socket_address.h"
 #include "quiche/quic/platform/api/quic_test_loopback.h"
 #include "quiche/quic/test_tools/quic_test_utils.h"
diff --git a/quiche/quic/tools/quic_server.h b/quiche/quic/tools/quic_server.h
index cf71ac6..f97a459 100644
--- a/quiche/quic/tools/quic_server.h
+++ b/quiche/quic/tools/quic_server.h
@@ -17,11 +17,11 @@
 #include "quiche/quic/core/crypto/quic_crypto_server_config.h"
 #include "quiche/quic/core/deterministic_connection_id_generator.h"
 #include "quiche/quic/core/io/quic_event_loop.h"
-#include "quiche/quic/core/io/socket_factory.h"
 #include "quiche/quic/core/quic_config.h"
 #include "quiche/quic/core/quic_packet_writer.h"
 #include "quiche/quic/core/quic_udp_socket.h"
 #include "quiche/quic/core/quic_version_manager.h"
+#include "quiche/quic/core/socket_factory.h"
 #include "quiche/quic/platform/api/quic_socket_address.h"
 #include "quiche/quic/tools/quic_simple_server_backend.h"
 #include "quiche/quic/tools/quic_spdy_server_base.h"
diff --git a/quiche/quic/tools/quic_simple_server_backend.h b/quiche/quic/tools/quic_simple_server_backend.h
index 26eaa65..1ef3364 100644
--- a/quiche/quic/tools/quic_simple_server_backend.h
+++ b/quiche/quic/tools/quic_simple_server_backend.h
@@ -9,9 +9,9 @@
 #include <memory>
 
 #include "absl/strings/string_view.h"
-#include "quiche/quic/core/io/socket_factory.h"
 #include "quiche/quic/core/quic_error_codes.h"
 #include "quiche/quic/core/quic_types.h"
+#include "quiche/quic/core/socket_factory.h"
 #include "quiche/quic/core/web_transport_interface.h"
 #include "quiche/quic/tools/quic_backend_response.h"
 #include "quiche/spdy/core/http2_header_block.h"