cpp: fix duplicate namespaces in package comments
diagrams: re-add ecore as we need to get some ideas from it