diff --git a/backend/crates/gateway-api/src/openai/responses/websocket/connection.rs b/backend/crates/gateway-api/src/openai/responses/websocket/connection/mod.rs
similarity index 100%
rename from backend/crates/gateway-api/src/openai/responses/websocket/connection.rs
rename to backend/crates/gateway-api/src/openai/responses/websocket/connection/mod.rs
diff --git a/backend/crates/gateway-api/tests/architecture.rs b/backend/crates/gateway-api/tests/architecture.rs
index eb0c6945e..f8f5b1c73 100644
--- a/backend/crates/gateway-api/tests/architecture.rs
+++ b/backend/crates/gateway-api/tests/architecture.rs
@@ -67,7 +67,7 @@ fn source_tree_should_match_frozen_machine_manifest() {
         "src/openai/responses/mod.rs",
         "src/openai/responses/request.rs",
         "src/openai/responses/response.rs",
-        "src/openai/responses/websocket/connection.rs",
+        "src/openai/responses/websocket/connection/mod.rs",
         "src/openai/responses/websocket/forward.rs",
         "src/openai/responses/websocket/mod.rs",
         "src/openai/responses/websocket/protocol.rs",
@@ -110,7 +110,8 @@ fn test_tree_should_match_frozen_rust_mirror() {
         "tests/openai/provider_endpoint.rs",
         "tests/openai/responses/http.rs",
         "tests/openai/responses/mod.rs",
-        "tests/openai/responses/websocket/connection.rs",
+        "tests/openai/responses/websocket/connection/heartbeat.rs",
+        "tests/openai/responses/websocket/connection/mod.rs",
         "tests/openai/responses/websocket/mod.rs",
         "tests/openai/responses/websocket/protocol.rs",
         "tests/openai/router.rs",
diff --git a/backend/crates/gateway-api/tests/openai/responses/websocket/connection.rs b/backend/crates/gateway-api/tests/openai/responses/websocket/connection/mod.rs
similarity index 100%
rename from backend/crates/gateway-api/tests/openai/responses/websocket/connection.rs
rename to backend/crates/gateway-api/tests/openai/responses/websocket/connection/mod.rs