I did it in 2 commits otherwise git has a hard time seeing the move+edit as a file move and the `git show` on previous commit is much less useful.
Jehan