wmat: Prepare for merge.
wmat: Move to packages.