Major restructure configuration file