Reorg for inclusion in main repo