Reorg

Hi Russ,

Here's the same branch I just sent to Rich.

Thanks.