restructured config