Move salve.util modules into the salve namespace

All of these modules are now available without the intermediate ".util" in
their paths. Several of them have been folded into the salve.util replacement
module.