Refactored Org Resource and Governance to use internal governance field