Merge ldap and ldap-server

I think I've done this operation a few times already >.<