restructured config system