contents: Rework for Deployment 2.0 model

More things are toplevel symlinks now.
contents: Fix up some UsrMove bugs

We don't want to overwrite binaries with symlinks to the old binary
location.