Channel O ends Africa feed as M-Net restructures