Restructure config use - not done.