Rearrange files again