Restructured the config file a little...