Making packages consistent.
More fixes re. namespaces and packages.