first pass at full reorg complete