reorg for oe-a integration