Restructured config files to be more flexible