Git doesn't track file moves correctly so we have to split the operation
 in two different commits.