Rearrange the config's struct