Large refactor to remove the concept of ProviderOrg and condense with Provider.  Also removes the superclass Organization, which tied ProviderOrg and Agency