more lw operator reorg