diff --git a/codex-rs/core/src/context/world_state/environment_support.rs b/codex-rs/core/src/context/environment_context.rs
similarity index 99%
rename from codex-rs/core/src/context/world_state/environment_support.rs
rename to codex-rs/core/src/context/environment_context.rs
index 93382508e2..57958921db 100644
--- a/codex-rs/core/src/context/world_state/environment_support.rs
+++ b/codex-rs/core/src/context/environment_context.rs
@@ -205,7 +205,7 @@ fn push_text_element(rendered: &mut String, name: &str, value: &str) {
     rendered.push_str(&format!("</{name}>"));
 }
 
-pub(super) fn push_xml_escaped_text(rendered: &mut String, value: &str) {
+pub(crate) fn push_xml_escaped_text(rendered: &mut String, value: &str) {
     for ch in value.chars() {
         match ch {
             '&' => rendered.push_str("&amp;"),
diff --git a/codex-rs/core/src/context/mod.rs b/codex-rs/core/src/context/mod.rs
index 059e436fe9..616d999627 100644
--- a/codex-rs/core/src/context/mod.rs
+++ b/codex-rs/core/src/context/mod.rs
@@ -7,6 +7,7 @@ mod available_skills_instructions;
 mod collaboration_mode_instructions;
 mod contextual_user_message;
 mod current_time_reminder;
+mod environment_context;
 mod guardian_followup_review_reminder;
 mod hook_additional_context;
 mod image_generation_instructions;
diff --git a/codex-rs/core/src/context/world_state/environment.rs b/codex-rs/core/src/context/world_state/environment.rs
index 891fed46dd..d5c84b67f0 100644
--- a/codex-rs/core/src/context/world_state/environment.rs
+++ b/codex-rs/core/src/context/world_state/environment.rs
@@ -1,8 +1,8 @@
 use super::WorldStateSection;
-use super::environment_support::FileSystemContext;
-use super::environment_support::NetworkContext;
-use super::environment_support::push_xml_escaped_text;
 use crate::context::ContextualUserFragment;
+use crate::context::environment_context::FileSystemContext;
+use crate::context::environment_context::NetworkContext;
+use crate::context::environment_context::push_xml_escaped_text;
 use crate::session::turn_context::TurnContext;
 use codex_exec_server::LOCAL_ENVIRONMENT_ID;
 use codex_protocol::models::ResponseItem;
diff --git a/codex-rs/core/src/context/world_state/mod.rs b/codex-rs/core/src/context/world_state/mod.rs
index 1c142f118f..8ca0bfbf03 100644
--- a/codex-rs/core/src/context/world_state/mod.rs
+++ b/codex-rs/core/src/context/world_state/mod.rs
@@ -1,5 +1,4 @@
 mod environment;
-mod environment_support;
 
 use codex_protocol::models::ResponseItem;
 use indexmap::IndexMap;