Restructure config file, make server config less magic