facilityController edit restructuring
Merge.