refactor

Run with:

./refactor.sh

Undo with:

./git-restore.sh