finish transition from events -> announcements

Someone started this in 7977321a1c60af1697ad1a18866ff3d5955edc73