So we will have to look at the state of the files before and after this PR if we want to understand things. I think it will be better afterwards, except for the tests I broke.