diff --git a/app/agent/middleware/skills.py b/app/agent/middleware/skills.py
index 0c2287467..6e7c51529 100644
--- a/app/agent/middleware/skills.py
+++ b/app/agent/middleware/skills.py
@@ -24,7 +24,7 @@ from langgraph.runtime import Runtime
 from pydantic import BaseModel, Field
 
 from app.agent.middleware.utils import append_to_system_message
-from app.agent.policy import sanitize_for_host, summarize_error
+from app.agent.policy.sanitizer import sanitize_for_host, summarize_error
 from app.agent.tools.tags import ToolTag
 from app.agent.skills.metadata import (
     MAX_SKILL_FILE_SIZE,
diff --git a/app/agent/middleware/tool_selection.py b/app/agent/middleware/tool_selection.py
index 8c0fb377c..a34d17602 100644
--- a/app/agent/middleware/tool_selection.py
+++ b/app/agent/middleware/tool_selection.py
@@ -26,7 +26,7 @@ from langchain_core.tools import BaseTool
 from langgraph.runtime import Runtime
 from typing_extensions import TypedDict  # noqa
 
-from app.agent.llm import LLMHelper
+from app.agent.llm.helper import LLMHelper
 from app.agent.tools.tags import ToolTag
 from app.runtime.log import logger
 
diff --git a/app/agent/tools/catalog.py b/app/agent/tools/catalog.py
index c0167b645..f04c49055 100644
--- a/app/agent/tools/catalog.py
+++ b/app/agent/tools/catalog.py
@@ -8,7 +8,7 @@ from typing import Any, Mapping, Optional
 
 from pydantic import BaseModel
 
-from app.agent.policy import ToolRevision
+from app.agent.policy.contracts import ToolRevision
 
 
 class ToolCatalogError(RuntimeError):
diff --git a/app/agent/tools/impl/query_doctor_report.py b/app/agent/tools/impl/query_doctor_report.py
index eb963ea8b..f297a2072 100644
--- a/app/agent/tools/impl/query_doctor_report.py
+++ b/app/agent/tools/impl/query_doctor_report.py
@@ -7,7 +7,7 @@ from pydantic import BaseModel, Field
 
 from app.agent.tools.base import MoviePilotTool
 from app.agent.tools.tags import ToolTag
-from app.doctor import run_doctor
+from app.doctor.runner import run_doctor
 from app.runtime.log import logger
 
 
diff --git a/app/modules/filemanager/storages/alipan.py b/app/modules/filemanager/storages/alipan.py
index c8afbb6d8..f37df2aa4 100644
--- a/app/modules/filemanager/storages/alipan.py
+++ b/app/modules/filemanager/storages/alipan.py
@@ -15,8 +15,7 @@ from app.runtime.config import global_vars
 
 settings = RuntimeSettingsCompat()
 from app.runtime.log import logger
-from app.modules.filemanager import StorageBase
-from app.modules.filemanager.storages import transfer_process
+from app.modules.filemanager.storages import StorageBase, transfer_process
 from app.schemas.exception import StorageQueryError
 from app.schemas.types import StorageSchema
 from app.adapters.network.http import RequestUtils
diff --git a/app/modules/filemanager/storages/smb.py b/app/modules/filemanager/storages/smb.py
index 5f08d911b..e0e467b96 100644
--- a/app/modules/filemanager/storages/smb.py
+++ b/app/modules/filemanager/storages/smb.py
@@ -19,8 +19,7 @@ from app.runtime.config import global_vars
 
 settings = RuntimeSettingsCompat()
 from app.runtime.log import logger
-from app.modules.filemanager import StorageBase
-from app.modules.filemanager.storages import transfer_process
+from app.modules.filemanager.storages import StorageBase, transfer_process
 from app.schemas.exception import StorageQueryError
 from app.schemas.types import StorageSchema
 from app.foundation.singleton import WeakSingleton
diff --git a/app/modules/filemanager/storages/u115.py b/app/modules/filemanager/storages/u115.py
index db90db3f5..c3085fb7d 100644
--- a/app/modules/filemanager/storages/u115.py
+++ b/app/modules/filemanager/storages/u115.py
@@ -19,8 +19,7 @@ from app.runtime.config import global_vars
 
 settings = RuntimeSettingsCompat()
 from app.runtime.log import logger
-from app.modules.filemanager import StorageBase
-from app.modules.filemanager.storages import transfer_process
+from app.modules.filemanager.storages import StorageBase, transfer_process
 from app.schemas.exception import StorageQueryError
 from app.schemas.types import StorageSchema
 from app.foundation.singleton import WeakSingleton