Clean-up of edgebundling.
When this was copied over from the OSEHRA project lots of references to "package hierarchy" were remained.  Also, unused code was removed.