big reorg commit
cleanup