diff --git a/build/source_list.bzl b/build/source_list.bzl
index 551b30a..aaf08ad 100644
--- a/build/source_list.bzl
+++ b/build/source_list.bzl
@@ -234,8 +234,6 @@
     "quic/core/http/spdy_utils.h",
     "quic/core/http/web_transport_http3.h",
     "quic/core/http/web_transport_stream_adapter.h",
-    "quic/core/io/quic_default_event_loop.h",
-    "quic/core/io/quic_event_loop.h",
     "quic/core/legacy_quic_stream_id_manager.h",
     "quic/core/packet_number_indexed_queue.h",
     "quic/core/proto/cached_network_parameters_proto.h",
@@ -571,7 +569,6 @@
     "quic/core/http/spdy_utils.cc",
     "quic/core/http/web_transport_http3.cc",
     "quic/core/http/web_transport_stream_adapter.cc",
-    "quic/core/io/quic_default_event_loop.cc",
     "quic/core/legacy_quic_stream_id_manager.cc",
     "quic/core/qpack/qpack_blocking_manager.cc",
     "quic/core/qpack/qpack_decoded_headers_accumulator.cc",
@@ -935,6 +932,8 @@
     "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/quic_default_event_loop.h",
+    "quic/core/io/quic_event_loop.h",
     "quic/core/quic_default_packet_writer.h",
     "quic/core/quic_epoll_alarm_factory.h",
     "quic/core/quic_epoll_clock.h",
@@ -965,6 +964,7 @@
     "quic/core/batch_writer/quic_batch_writer_buffer.cc",
     "quic/core/batch_writer/quic_gso_batch_writer.cc",
     "quic/core/batch_writer/quic_sendmmsg_batch_writer.cc",
+    "quic/core/io/quic_default_event_loop.cc",
     "quic/core/quic_default_packet_writer.cc",
     "quic/core/quic_epoll_alarm_factory.cc",
     "quic/core/quic_epoll_clock.cc",
@@ -1153,7 +1153,6 @@
     "quic/core/http/spdy_server_push_utils_test.cc",
     "quic/core/http/spdy_utils_test.cc",
     "quic/core/http/web_transport_http3_test.cc",
-    "quic/core/io/quic_default_event_loop_test.cc",
     "quic/core/legacy_quic_stream_id_manager_test.cc",
     "quic/core/packet_number_indexed_queue_test.cc",
     "quic/core/qpack/qpack_blocking_manager_test.cc",
@@ -1279,6 +1278,7 @@
     "quic/core/http/quic_spdy_client_session_test.cc",
     "quic/core/http/quic_spdy_client_stream_test.cc",
     "quic/core/http/quic_spdy_server_stream_base_test.cc",
+    "quic/core/io/quic_default_event_loop_test.cc",
     "quic/core/quic_epoll_alarm_factory_test.cc",
     "quic/core/quic_epoll_clock_test.cc",
     "quic/core/quic_epoll_connection_helper_test.cc",
diff --git a/build/source_list.gni b/build/source_list.gni
index 934a09d..fcc9576 100644
--- a/build/source_list.gni
+++ b/build/source_list.gni
@@ -234,8 +234,6 @@
     "src/quiche/quic/core/http/spdy_utils.h",
     "src/quiche/quic/core/http/web_transport_http3.h",
     "src/quiche/quic/core/http/web_transport_stream_adapter.h",
-    "src/quiche/quic/core/io/quic_default_event_loop.h",
-    "src/quiche/quic/core/io/quic_event_loop.h",
     "src/quiche/quic/core/legacy_quic_stream_id_manager.h",
     "src/quiche/quic/core/packet_number_indexed_queue.h",
     "src/quiche/quic/core/proto/cached_network_parameters_proto.h",
@@ -571,7 +569,6 @@
     "src/quiche/quic/core/http/spdy_utils.cc",
     "src/quiche/quic/core/http/web_transport_http3.cc",
     "src/quiche/quic/core/http/web_transport_stream_adapter.cc",
-    "src/quiche/quic/core/io/quic_default_event_loop.cc",
     "src/quiche/quic/core/legacy_quic_stream_id_manager.cc",
     "src/quiche/quic/core/qpack/qpack_blocking_manager.cc",
     "src/quiche/quic/core/qpack/qpack_decoded_headers_accumulator.cc",
@@ -935,6 +932,8 @@
     "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/quic_default_event_loop.h",
+    "src/quiche/quic/core/io/quic_event_loop.h",
     "src/quiche/quic/core/quic_default_packet_writer.h",
     "src/quiche/quic/core/quic_epoll_alarm_factory.h",
     "src/quiche/quic/core/quic_epoll_clock.h",
@@ -965,6 +964,7 @@
     "src/quiche/quic/core/batch_writer/quic_batch_writer_buffer.cc",
     "src/quiche/quic/core/batch_writer/quic_gso_batch_writer.cc",
     "src/quiche/quic/core/batch_writer/quic_sendmmsg_batch_writer.cc",
+    "src/quiche/quic/core/io/quic_default_event_loop.cc",
     "src/quiche/quic/core/quic_default_packet_writer.cc",
     "src/quiche/quic/core/quic_epoll_alarm_factory.cc",
     "src/quiche/quic/core/quic_epoll_clock.cc",
@@ -1153,7 +1153,6 @@
     "src/quiche/quic/core/http/spdy_server_push_utils_test.cc",
     "src/quiche/quic/core/http/spdy_utils_test.cc",
     "src/quiche/quic/core/http/web_transport_http3_test.cc",
-    "src/quiche/quic/core/io/quic_default_event_loop_test.cc",
     "src/quiche/quic/core/legacy_quic_stream_id_manager_test.cc",
     "src/quiche/quic/core/packet_number_indexed_queue_test.cc",
     "src/quiche/quic/core/qpack/qpack_blocking_manager_test.cc",
@@ -1279,6 +1278,7 @@
     "src/quiche/quic/core/http/quic_spdy_client_session_test.cc",
     "src/quiche/quic/core/http/quic_spdy_client_stream_test.cc",
     "src/quiche/quic/core/http/quic_spdy_server_stream_base_test.cc",
+    "src/quiche/quic/core/io/quic_default_event_loop_test.cc",
     "src/quiche/quic/core/quic_epoll_alarm_factory_test.cc",
     "src/quiche/quic/core/quic_epoll_clock_test.cc",
     "src/quiche/quic/core/quic_epoll_connection_helper_test.cc",
diff --git a/build/source_list.json b/build/source_list.json
index a93bfae..8ad5c07 100644
--- a/build/source_list.json
+++ b/build/source_list.json
@@ -233,8 +233,6 @@
     "quiche/quic/core/http/spdy_utils.h",
     "quiche/quic/core/http/web_transport_http3.h",
     "quiche/quic/core/http/web_transport_stream_adapter.h",
-    "quiche/quic/core/io/quic_default_event_loop.h",
-    "quiche/quic/core/io/quic_event_loop.h",
     "quiche/quic/core/legacy_quic_stream_id_manager.h",
     "quiche/quic/core/packet_number_indexed_queue.h",
     "quiche/quic/core/proto/cached_network_parameters_proto.h",
@@ -570,7 +568,6 @@
     "quiche/quic/core/http/spdy_utils.cc",
     "quiche/quic/core/http/web_transport_http3.cc",
     "quiche/quic/core/http/web_transport_stream_adapter.cc",
-    "quiche/quic/core/io/quic_default_event_loop.cc",
     "quiche/quic/core/legacy_quic_stream_id_manager.cc",
     "quiche/quic/core/qpack/qpack_blocking_manager.cc",
     "quiche/quic/core/qpack/qpack_decoded_headers_accumulator.cc",
@@ -934,6 +931,8 @@
     "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/quic_default_event_loop.h",
+    "quiche/quic/core/io/quic_event_loop.h",
     "quiche/quic/core/quic_default_packet_writer.h",
     "quiche/quic/core/quic_epoll_alarm_factory.h",
     "quiche/quic/core/quic_epoll_clock.h",
@@ -964,6 +963,7 @@
     "quiche/quic/core/batch_writer/quic_batch_writer_buffer.cc",
     "quiche/quic/core/batch_writer/quic_gso_batch_writer.cc",
     "quiche/quic/core/batch_writer/quic_sendmmsg_batch_writer.cc",
+    "quiche/quic/core/io/quic_default_event_loop.cc",
     "quiche/quic/core/quic_default_packet_writer.cc",
     "quiche/quic/core/quic_epoll_alarm_factory.cc",
     "quiche/quic/core/quic_epoll_clock.cc",
@@ -1152,7 +1152,6 @@
     "quiche/quic/core/http/spdy_server_push_utils_test.cc",
     "quiche/quic/core/http/spdy_utils_test.cc",
     "quiche/quic/core/http/web_transport_http3_test.cc",
-    "quiche/quic/core/io/quic_default_event_loop_test.cc",
     "quiche/quic/core/legacy_quic_stream_id_manager_test.cc",
     "quiche/quic/core/packet_number_indexed_queue_test.cc",
     "quiche/quic/core/qpack/qpack_blocking_manager_test.cc",
@@ -1278,6 +1277,7 @@
     "quiche/quic/core/http/quic_spdy_client_session_test.cc",
     "quiche/quic/core/http/quic_spdy_client_stream_test.cc",
     "quiche/quic/core/http/quic_spdy_server_stream_base_test.cc",
+    "quiche/quic/core/io/quic_default_event_loop_test.cc",
     "quiche/quic/core/quic_epoll_alarm_factory_test.cc",
     "quiche/quic/core/quic_epoll_clock_test.cc",
     "quiche/quic/core/quic_epoll_connection_helper_test.cc",