big reorg
supporting reorg
moved
lots more cleaning up. nearly done