Refactored OrganizationService
adds insert/update