Safe refactor

• Keep feature changes outside refactor.
• Move one ownership boundary at a time.
• Preserve public interfaces, failure behavior, ordering, and compatibility unless explicitly scoped.
• Keep intermediate states buildable and testable.
• Avoid dependency or configuration growth without correctness need.