Restructured config