refactor organization_factory