Rework package structure.

Plus a couple of assorted amendments.
Update NEWS.