Restructured config a bit