moved some files around
new umbrella module
cleanup everywhere

Lots of imports changed to reflect new layout, updates to use common
code in old tools.
more moving of files
move final files, fix dependent modules