new umbrella module
cleanup everywhere

Lots of imports changed to reflect new layout, updates to use common
code in old tools.