Major refactor reflecting the renaming from Facilitator to Revisit, and changingFacilities to Sites [Delivers #73995616]