Restructured config handling