Refactor oparent for independent versioning

No match.