redo namespacing
cleanup namespace deps
minor adjustments