rearrange config file a bit