Restructured config struct