Rearrange files some more.