restructure config a little