refactor

Large-scale refactoring workflow: explore the current state, plan the migration, implement changes, test thoroughly, and review.