Rearrange config file abit