Before editing any files, read {{files_or_folders}} and plan a refactor to achieve this goal: {{refactor_goal}} Constraints: behavior must stay the same for users and callers, public interfaces stay stable unless I approve a change, and {{extra_constraints}}. Return a plan, not code: 1. How the current code is structured and where the problems are, with file and function names 2. The target structure, in a few sentences 3. Steps small enough for one commit each, where the app builds and tests pass after every step 4. For each step: files touched, what moves or changes, and how to verify it 5. Tests to add before starting, to lock in current behavior 6. Risks, such as hidden callers, side effects, or performance changes Point out anything you couldn't find or verify. Wait for my approval before making changes.