Restructured config to be more consistent