Post-feedback refactor with file separation, name changes, spies, and edits