diff --git a/backend/onyx/agents/agent_search/basic/graph_builder.py b/backend/onyx/agents/agent_search/basic/graph_builder.py
index dcd27d5ce..9904e6fbf 100644
--- a/backend/onyx/agents/agent_search/basic/graph_builder.py
+++ b/backend/onyx/agents/agent_search/basic/graph_builder.py
@@ -5,12 +5,14 @@ from langgraph.graph import StateGraph
 from onyx.agents.agent_search.basic.states import BasicInput
 from onyx.agents.agent_search.basic.states import BasicOutput
 from onyx.agents.agent_search.basic.states import BasicState
-from onyx.agents.agent_search.orchestration.basic_use_tool_response import (
+from onyx.agents.agent_search.orchestration.nodes.basic_use_tool_response import (
     basic_use_tool_response,
 )
-from onyx.agents.agent_search.orchestration.llm_tool_choice import llm_tool_choice
-from onyx.agents.agent_search.orchestration.prepare_tool_input import prepare_tool_input
-from onyx.agents.agent_search.orchestration.tool_call import tool_call
+from onyx.agents.agent_search.orchestration.nodes.llm_tool_choice import llm_tool_choice
+from onyx.agents.agent_search.orchestration.nodes.prepare_tool_input import (
+    prepare_tool_input,
+)
+from onyx.agents.agent_search.orchestration.nodes.tool_call import tool_call
 from onyx.utils.logger import setup_logger
 
 logger = setup_logger()
diff --git a/backend/onyx/agents/agent_search/deep_search_a/main/graph_builder.py b/backend/onyx/agents/agent_search/deep_search_a/main/graph_builder.py
index 920dd91c1..abdcdf4c2 100644
--- a/backend/onyx/agents/agent_search/deep_search_a/main/graph_builder.py
+++ b/backend/onyx/agents/agent_search/deep_search_a/main/graph_builder.py
@@ -67,12 +67,14 @@ from onyx.agents.agent_search.deep_search_a.main.nodes.retrieval_consolidation i
 )
 from onyx.agents.agent_search.deep_search_a.main.states import MainInput
 from onyx.agents.agent_search.deep_search_a.main.states import MainState
-from onyx.agents.agent_search.orchestration.basic_use_tool_response import (
+from onyx.agents.agent_search.orchestration.nodes.basic_use_tool_response import (
     basic_use_tool_response,
 )
-from onyx.agents.agent_search.orchestration.llm_tool_choice import llm_tool_choice
-from onyx.agents.agent_search.orchestration.prepare_tool_input import prepare_tool_input
-from onyx.agents.agent_search.orchestration.tool_call import tool_call
+from onyx.agents.agent_search.orchestration.nodes.llm_tool_choice import llm_tool_choice
+from onyx.agents.agent_search.orchestration.nodes.prepare_tool_input import (
+    prepare_tool_input,
+)
+from onyx.agents.agent_search.orchestration.nodes.tool_call import tool_call
 from onyx.agents.agent_search.shared_graph_utils.utils import get_test_config
 from onyx.utils.logger import setup_logger
 
diff --git a/backend/onyx/agents/agent_search/orchestration/basic_use_tool_response.py b/backend/onyx/agents/agent_search/orchestration/nodes/basic_use_tool_response.py
similarity index 100%
rename from backend/onyx/agents/agent_search/orchestration/basic_use_tool_response.py
rename to backend/onyx/agents/agent_search/orchestration/nodes/basic_use_tool_response.py
diff --git a/backend/onyx/agents/agent_search/orchestration/llm_tool_choice.py b/backend/onyx/agents/agent_search/orchestration/nodes/llm_tool_choice.py
similarity index 100%
rename from backend/onyx/agents/agent_search/orchestration/llm_tool_choice.py
rename to backend/onyx/agents/agent_search/orchestration/nodes/llm_tool_choice.py
diff --git a/backend/onyx/agents/agent_search/orchestration/prepare_tool_input.py b/backend/onyx/agents/agent_search/orchestration/nodes/prepare_tool_input.py
similarity index 87%
rename from backend/onyx/agents/agent_search/orchestration/prepare_tool_input.py
rename to backend/onyx/agents/agent_search/orchestration/nodes/prepare_tool_input.py
index 385ffa52e..94d172c07 100644
--- a/backend/onyx/agents/agent_search/orchestration/prepare_tool_input.py
+++ b/backend/onyx/agents/agent_search/orchestration/nodes/prepare_tool_input.py
@@ -10,6 +10,7 @@ from onyx.agents.agent_search.orchestration.states import ToolChoiceInput
 def prepare_tool_input(state: Any, config: RunnableConfig) -> ToolChoiceInput:
     agent_config = cast(AgentSearchConfig, config["metadata"]["config"])
     return ToolChoiceInput(
+        # NOTE: this node is used at the top level of the agent, so we always stream
         should_stream_answer=True,
         prompt_snapshot=None,  # uses default prompt builder
         tools=[tool.name for tool in (agent_config.tools or [])],
diff --git a/backend/onyx/agents/agent_search/orchestration/tool_call.py b/backend/onyx/agents/agent_search/orchestration/nodes/tool_call.py
similarity index 100%
rename from backend/onyx/agents/agent_search/orchestration/tool_call.py
rename to backend/onyx/agents/agent_search/orchestration/nodes/tool_call.py