And turn all "add" into "replace" so old messages get removed. Update tests too.
De-clutter the source directories a bit. Ensure tests build with meson, and remove from autotools in a few places (no need to do things twice).
