The grouping in the topology diagram should be something similar azure groupings

Something like this

Otherwise we would end up that most of groupings would have only one entity, it might be more complex collapse and un collapse for dragging and dropping the entities in the diagram section