Move config stuff into the config files