restructured config vars