Move some OA modules to CoA forks