Created OrgOwner state class to hold the org and owner that get created out of a Organization Resource.
Refactored existing classes to use it.