Restructured config directory