refactor-plan

Plan a multi-file refactor with proper sequencing and rollback steps