Major reformat of the configuration file