Reorder packages and models
Currently we have a duplicative structure with various locations for similar models, e.g. HVAC and Fluid, Controls and Utilities.Control. This is mainly caused by merging AixLib and Annex60 BaseLib. We should define a new structure that complies to Annex60.