New Direction for Facilities

- Also split out FacilityList class