Refs #14827 EEA; restructured config files to allow better separation