According to official Swiss map, the whole thing is one building complex with one address and one EGID number (see as well WD item). I have separated just one building, Reusspark 8a from the building complex Reusspark 8. According swisstopo the church building as such is just one part of the whole complex. So, I would leave the whole thing, as I don't see that more action would add additional benefit to users. if you agree, please resolve.