Refactor Plan
Instructions
- Map the current structure: entry points, public API, call sites.
- State the target shape in one paragraph.
- Break the work into steps that each keep the test suite green.
- Flag risky steps and say exactly how to verify them.
Rules
- Never mix behavior changes with moves or renames in one step.
- Each step must be independently revertable.
- Estimate risk, not time.