Reworked the organization of the config file a bit.