diff --git a/dap-was-lib/src/main/java/io/shinhanlife/dap/lib/mcp/mcp/ToolPodMcpToolSynchronizer.java b/dap-was-lib/src/main/java/io/shinhanlife/dap/lib/usecase/ToolPodMcpToolSynchronizer.java
similarity index 96%
rename from dap-was-lib/src/main/java/io/shinhanlife/dap/lib/mcp/mcp/ToolPodMcpToolSynchronizer.java
rename to dap-was-lib/src/main/java/io/shinhanlife/dap/lib/usecase/ToolPodMcpToolSynchronizer.java
index 1bc93e39..41ebf4ba 100644
--- a/dap-was-lib/src/main/java/io/shinhanlife/dap/lib/mcp/mcp/ToolPodMcpToolSynchronizer.java
+++ b/dap-was-lib/src/main/java/io/shinhanlife/dap/lib/usecase/ToolPodMcpToolSynchronizer.java
@@ -1,4 +1,4 @@
-package io.shinhanlife.dap.lib.mcp;
+package io.shinhanlife.dap.lib.usecase;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.modelcontextprotocol.server.McpServerFeatures;
@@ -7,6 +7,8 @@ import io.modelcontextprotocol.spec.McpSchema;
 import io.shinhanlife.dap.lib.dto.ToolMetadata;
 import io.shinhanlife.dap.mcc.presentation.BusinessToolController;
 import io.shinhanlife.dap.lib.usecase.ToolRegistryHeartbeatSender;
+import io.shinhanlife.dap.lib.mcp.McpRequestHeaderContext;
+import io.shinhanlife.dap.lib.mcp.McpRequestHeaders;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import org.springframework.boot.context.event.ApplicationReadyEvent;