Refine SubMap and instances
Add (Diagrams.Core.Names.|>~)
Restructure SubMap, separate Path component from annotations