Restructured the config file and added defaults