Rearrange config files