Rearrange some files