Rearrange the configuration file to make more sense