massive reorg

conceptual reorg inproc.
cont'd