restructured config file layout