Reclassify Facility as a Composite

I don't think Facility needs to be an Active Structure. Location used to be an Active Structure and it was changed to a Composite, and I think the same reasoning should be applied to Facility.

Most of the modelling I have done using Facility has been to show what is 'contained' within a Facility, especially the Technology situated there. As such simple Aggregation/ Composition Relationships are sufficient. As it stands I have to use a mixture of Relationship types, and not all of them make sense really - for example Facility 'containing' a Communication Network gives options 'serves','triggers','flows' ...

Such a change would beg the question do we need both the Facility and the Location concepts. I would argue that this is useful, as a Facility implies a constructed artefact, whereas a Location is more abstract. Facility as a type of Location in the metamodel?