restructured config a bit