LDAP_organization_ refactoring