From 54df376a9c2dd458a82eaa09bfbb718fe699dd0d Mon Sep 17 00:00:00 2001
From: Mathieu <mbaudier@argeo.org>
Date: Sat, 5 Nov 2022 07:52:27 +0100
Subject: [PATCH] Massive package refactoring

---
 Makefile                                      |   2 +-
 .../src/org/argeo/api/acr/ArgeoNamespace.java |  14 ++
 .../org/argeo/api/acr/CrAttributeType.java    |   2 +-
 .../src/org/argeo/api/acr/CrName.java         |  13 +-
 .../api/acr/RuntimeNamespaceContext.java      |   6 +-
 .../argeo/api/acr/ldap}/Distinguished.java    |   2 +-
 .../org/argeo/api/acr/ldap}/LdapAttrs.java    |  27 +++-
 .../src/org/argeo/api/acr/ldap}/LdapObjs.java |  31 +++--
 .../org/argeo/api/acr/ldap}/NamingUtils.java  |   2 +-
 .../src/org/argeo/api/acr/ldap}/NodeOID.java  |   2 +-
 .../argeo/api/acr/ldap}/SpecifiedName.java    |   2 +-
 .../api/acr}/tabular/ArrayTabularRow.java     |   2 +-
 .../argeo/api/acr}/tabular/TabularColumn.java |   2 +-
 .../api/acr}/tabular/TabularContent.java      |   2 +-
 .../argeo/api/acr}/tabular/TabularRow.java    |   2 +-
 .../api/acr}/tabular/TabularRowIterator.java  |   2 +-
 .../argeo/api/acr}/tabular/TabularWriter.java |   2 +-
 .../argeo/api/acr/tabular/package-info.java   |   2 +
 .../argeo/api/cms}/directory/Directory.java   |   4 +-
 .../cms}/directory/DirectoryDigestUtils.java  |   2 +-
 .../api/cms}/directory/HierarchyUnit.java     |   2 +-
 .../argeo/api/cms/keyring}/CryptoKeyring.java |   2 +-
 .../org/argeo/api/cms/keyring}/Keyring.java   |   2 +-
 .../api/cms/keyring}/PBEKeySpecCallback.java  |   2 +-
 .../argeo/api/cms/keyring}/package-info.java  |   2 +-
 .../cms}/transaction/AbstractWorkingCopy.java |   2 +-
 .../cms}/transaction/JtaStatusAdapter.java    |   2 +-
 .../transaction/SimpleRollbackException.java  |   2 +-
 .../cms}/transaction/SimpleTransaction.java   |   2 +-
 .../transaction/SimpleTransactionManager.java |   2 +-
 .../transaction/TransactionStatusAdapter.java |   2 +-
 .../argeo/api/cms}/transaction/UuidXid.java   |   2 +-
 .../api/cms}/transaction/WorkContext.java     |   2 +-
 .../api/cms}/transaction/WorkControl.java     |   2 +-
 .../api/cms}/transaction/WorkTransaction.java |   2 +-
 .../api/cms}/transaction/WorkingCopy.java     |   2 +-
 .../transaction/WorkingCopyProcessor.java     |   2 +-
 .../transaction/WorkingCopyXaResource.java    |   2 +-
 .../cms}/transaction/XAResourceProvider.java  |   2 +-
 .../api/cms}/transaction/package-info.java    |   2 +-
 .../.classpath                                |   0
 .../.project                                  |   2 +-
 .../META-INF/.gitignore                       |   0
 org.argeo.api.register/bnd.bnd                |   3 +
 .../build.properties                          |   0
 .../org/argeo/api}/register/Component.java    |   2 +-
 .../api}/register/ComponentRegister.java      |   2 +-
 .../org/argeo/api}/register/RankingKey.java   |   2 +-
 .../argeo/api}/register/SimpleRegister.java   |   2 +-
 org.argeo.cms.ee/bnd.bnd                      |   1 -
 .../cms/integration/CmsExceptionsChain.java   |   2 +-
 .../cms/integration/CmsTokenServlet.java      |   2 +-
 .../argeo/cms/servlet/CmsServletContext.java  |   4 -
 .../cms/servlet/internal/PkgServlet.java      |   4 +-
 .../cms/websocket/server/TestEndpoint.java    |   2 +-
 .../org/argeo/cms/jetty/JettyHttpServer.java  |   2 +-
 .../src/org/argeo/cms/ssh/BasicSshServer.java |   2 +-
 .../src/org/argeo/cms/ssh/SshSync.java        |   2 +-
 .../src/org/argeo/cms/ux/CmsUxUtils.java      |   2 +-
 org.argeo.cms/OSGI-INF/cmsUserAdmin.xml       |   4 +-
 org.argeo.cms/OSGI-INF/cmsUserManager.xml     |   2 +-
 org.argeo.cms/OSGI-INF/transactionManager.xml |   6 +-
 .../cms/{security => }/AbstractKeyring.java   |   9 +-
 .../src/org/argeo/cms/CmsUserManager.java     |   4 +-
 .../org/argeo/cms/acr/AbstractContent.java    |   2 +-
 .../cms/acr/AbstractContentRepository.java    |   3 +-
 .../argeo/cms/acr/CmsContentRepository.java   |   2 +-
 .../org/argeo/cms/acr/CmsContentTypes.java    |   4 +-
 .../src/org/argeo/cms/acr/ContentUtils.java   |   8 +-
 .../cms/acr/SingleUserContentRepository.java  |   2 +-
 .../src/org/argeo/cms/acr/dav/DavContent.java |   2 +-
 .../argeo/cms/acr/dav/DavContentProvider.java |   2 +-
 .../directory/AbstractDirectoryContent.java   |  12 +-
 .../cms/acr/directory/DirectoryContent.java   |   4 +-
 .../directory/DirectoryContentProvider.java   |  18 +--
 .../acr/directory/HierarchyUnitContent.java   |   6 +-
 .../argeo/cms/acr/directory/RoleContent.java  |   2 +-
 .../src/org/argeo/cms/acr/fs/FsContent.java   |   2 +-
 .../argeo/cms/acr/fs/FsContentProvider.java   |  10 +-
 .../argeo/cms/acr/xml/ElementIterator.java    |   3 +-
 .../src/org/argeo/cms/auth/CmsAuthUtils.java  |   2 +-
 .../src/org/argeo/cms/auth/CmsRole.java       |   4 +-
 .../src/org/argeo/cms/auth/CurrentUser.java   |   2 +-
 .../argeo/cms/auth/KeyringLoginModule.java    |   6 +-
 .../org/argeo/cms/auth/RemoteAuthUtils.java   |   6 +-
 .../cms/auth/RemoteSessionLoginModule.java    |   2 +-
 .../argeo/cms/auth/SingleUserLoginModule.java |   6 +-
 .../argeo/cms/auth/UserAdminLoginModule.java  |  10 +-
 .../org/argeo/cms/auth/UserAdminUtils.java    |   2 +-
 .../src/org/argeo/cms/client/CmsClient.java   |   2 +-
 .../src/org/argeo/cms/dav/DavClient.java      |   6 +-
 .../src/org/argeo/cms/dav/DavDepth.java       |   2 +-
 .../src/org/argeo/cms/dav/DavHttpHandler.java |   8 +-
 .../src/org/argeo/cms/dav/DavResponse.java    |   2 +-
 .../org/argeo/cms/dav/MultiStatusReader.java  |   2 +-
 .../org/argeo/cms/dav/MultiStatusWriter.java  |   2 +-
 .../directory/ldap/AbstractLdapDirectory.java |  22 +--
 .../ldap/AbstractLdapDirectoryDao.java        |   2 +-
 .../directory/ldap/AttributesDictionary.java  |   2 +-
 .../cms}/directory/ldap/AuthPassword.java     |   4 +-
 .../cms}/directory/ldap/DefaultLdapEntry.java |   8 +-
 .../argeo/cms}/directory/ldap/IpaUtils.java   |   8 +-
 .../cms}/directory/ldap/LdapConnection.java   |   6 +-
 .../argeo/cms}/directory/ldap/LdapDao.java    |  10 +-
 .../cms}/directory/ldap/LdapDirectoryDao.java |   6 +-
 .../argeo/cms}/directory/ldap/LdapEntry.java  |   4 +-
 .../directory/ldap/LdapEntryWorkingCopy.java  |   4 +-
 .../directory/ldap/LdapHierarchyUnit.java     |   4 +-
 .../cms}/directory/ldap/LdapNameUtils.java    |   2 +-
 .../argeo/cms}/directory/ldap/LdifDao.java    |  10 +-
 .../argeo/cms}/directory/ldap/LdifParser.java |   4 +-
 .../argeo/cms}/directory/ldap/LdifWriter.java |  10 +-
 .../cms}/directory/ldap/SharedSecret.java     |   4 +-
 .../src/org/argeo/cms}/dns/DnsBrowser.java    |   2 +-
 .../src/org/argeo/cms}/dns/SrvRecord.java     |   2 +-
 .../{security => file}/ChecksumFactory.java   |   2 +-
 .../src/org/argeo/cms}/http/HttpHeader.java   |   2 +-
 .../src/org/argeo/cms}/http/HttpMethod.java   |   2 +-
 .../org/argeo/cms}/http/HttpServerUtils.java  |   2 +-
 .../src/org/argeo/cms}/http/HttpStatus.java   |   2 +-
 .../cms/internal/auth/CmsUserManagerImpl.java |  26 ++--
 .../cms/internal/auth/ImpliedByPrincipal.java |   4 +-
 .../cms/internal/osgi/CmsOsgiLogger.java      |   2 +-
 .../internal/runtime/CmsAcrHttpHandler.java   |   4 +-
 .../cms/internal/runtime/CmsStateImpl.java    |   2 +-
 .../cms/internal/runtime/CmsUserAdmin.java    |  14 +-
 .../org/argeo/cms/osgi/BundleCmsTheme.java    |   2 +-
 .../argeo/cms/osgi}/FilterRequirement.java    |   2 +-
 .../useradmin/AggregatingAuthorization.java   |   2 +-
 .../osgi/useradmin/AggregatingUserAdmin.java  |   6 +-
 .../osgi/useradmin/AuthenticatingUser.java    |   4 +-
 .../cms}/osgi/useradmin/DirectoryGroup.java   |   2 +-
 .../cms}/osgi/useradmin/DirectoryUser.java    |   2 +-
 .../osgi/useradmin/DirectoryUserAdmin.java    |  34 ++---
 .../osgi/useradmin/LdifAuthorization.java     |   4 +-
 .../argeo/cms}/osgi/useradmin/LdifGroup.java  |   4 +-
 .../argeo/cms}/osgi/useradmin/LdifUser.java   |   6 +-
 .../cms}/osgi/useradmin/OsUserDirectory.java  |  14 +-
 .../cms}/osgi/useradmin/OsUserUtils.java      |   2 +-
 .../argeo/cms}/osgi/useradmin/TokenUtils.java |   8 +-
 .../cms}/osgi/useradmin/UserDirectory.java    |   6 +-
 .../org/argeo/cms}/osgi/useradmin/jaas-os.cfg |   0
 .../cms}/osgi/useradmin/package-info.java     |   2 +-
 .../org/argeo/cms/runtime}/DirectoryConf.java |   7 +-
 .../src/org/argeo/cms/runtime/StaticCms.java  |  12 +-
 .../org/argeo/cms/tabular/package-info.java   |   2 -
 .../org/argeo/cms}/util/CompositeString.java  |   2 +-
 .../src/org/argeo/cms}/util/CsvParser.java    |   2 +-
 .../cms}/util/CsvParserWithLinesAsMap.java    |   2 +-
 .../src/org/argeo/cms}/util/CsvWriter.java    |   2 +-
 .../org/argeo/cms}/util/CurrentSubject.java   |   2 +-
 .../org/argeo/cms}/util/DictionaryKeys.java   |   2 +-
 .../src/org/argeo/cms}/util/DigestUtils.java  |   2 +-
 .../src/org/argeo/cms}/util/DirH.java         |   2 +-
 .../org/argeo/cms}/util/ExceptionsChain.java  |   2 +-
 .../src/org/argeo/cms}/util/FsUtils.java      |   2 +-
 .../src/org/argeo/cms}/util/LangUtils.java    |   2 +-
 .../src/org/argeo/cms}/util/OS.java           |   2 +-
 .../argeo/cms}/util/PasswordEncryption.java   |   2 +-
 .../org/argeo/cms}/util/ServiceChannel.java   |   2 +-
 .../src/org/argeo/cms}/util/StreamUtils.java  |   2 +-
 .../src/org/argeo/cms}/util/Tester.java       |   2 +-
 .../src/org/argeo/cms}/util/TesterStatus.java |   2 +-
 .../src/org/argeo/cms}/util/Throughput.java   |   2 +-
 .../src/org/argeo/cms}/util/package-info.java |   2 +-
 org.argeo.util/bnd.bnd                        |   6 -
 .../osgi/internal/EnterpriseActivator.java    |  21 ---
 .../SimpleProvisioningService.java            | 122 -----------------
 .../argeo/osgi/provisioning/package-info.java |   2 -
 .../osgi/util/OnServiceRegistration.java      |  98 -------------
 .../src/org/argeo/osgi/util/OsgiRegister.java |  56 --------
 .../org/argeo/util/internal/DisplayQName.java |  23 ----
 .../src/org/argeo/util/naming/LdapAttrs.csv   | 129 ------------------
 .../src/org/argeo/util/naming/LdapObjs.csv    |  42 ------
 .../org/argeo/util/naming/package-info.java   |   2 -
 .../servlet/internal/jetty/JettyConfig.java   |   2 +-
 .../argeo/cms/e4/handlers/ChangePassword.java |   4 +-
 .../argeo/cms/e4/handlers/CloseWorkbench.java |   2 +-
 .../org/argeo/cms/swt/AbstractSwtCmsView.java |   2 +-
 .../src/org/argeo/cms/web/CmsWebApp.java      |   2 +-
 .../cms/ui/rcp/CmsRcpDisplayFactory.java      |   2 +-
 .../rcp/internal/rwt/RcpResourceManager.java  |   2 +-
 182 files changed, 378 insertions(+), 844 deletions(-)
 create mode 100644 org.argeo.api.acr/src/org/argeo/api/acr/ArgeoNamespace.java
 rename {org.argeo.util/src/org/argeo/util/naming => org.argeo.api.acr/src/org/argeo/api/acr/ldap}/Distinguished.java (96%)
 rename {org.argeo.util/src/org/argeo/util/naming => org.argeo.api.acr/src/org/argeo/api/acr/ldap}/LdapAttrs.java (93%)
 rename {org.argeo.util/src/org/argeo/util/naming => org.argeo.api.acr/src/org/argeo/api/acr/ldap}/LdapObjs.java (81%)
 rename {org.argeo.util/src/org/argeo/util/naming => org.argeo.api.acr/src/org/argeo/api/acr/ldap}/NamingUtils.java (99%)
 rename {org.argeo.util/src/org/argeo/util/naming => org.argeo.api.acr/src/org/argeo/api/acr/ldap}/NodeOID.java (93%)
 rename {org.argeo.util/src/org/argeo/util/naming => org.argeo.api.acr/src/org/argeo/api/acr/ldap}/SpecifiedName.java (91%)
 rename {org.argeo.cms/src/org/argeo/cms => org.argeo.api.acr/src/org/argeo/api/acr}/tabular/ArrayTabularRow.java (91%)
 rename {org.argeo.cms/src/org/argeo/cms => org.argeo.api.acr/src/org/argeo/api/acr}/tabular/TabularColumn.java (95%)
 rename {org.argeo.cms/src/org/argeo/cms => org.argeo.api.acr/src/org/argeo/api/acr}/tabular/TabularContent.java (91%)
 rename {org.argeo.cms/src/org/argeo/cms => org.argeo.api.acr/src/org/argeo/api/acr}/tabular/TabularRow.java (87%)
 rename {org.argeo.cms/src/org/argeo/cms => org.argeo.api.acr/src/org/argeo/api/acr}/tabular/TabularRowIterator.java (89%)
 rename {org.argeo.cms/src/org/argeo/cms => org.argeo.api.acr/src/org/argeo/api/acr}/tabular/TabularWriter.java (86%)
 create mode 100644 org.argeo.api.acr/src/org/argeo/api/acr/tabular/package-info.java
 rename {org.argeo.util/src/org/argeo/util => org.argeo.api.cms/src/org/argeo/api/cms}/directory/Directory.java (89%)
 rename {org.argeo.util/src/org/argeo/util => org.argeo.api.cms/src/org/argeo/api/cms}/directory/DirectoryDigestUtils.java (99%)
 rename {org.argeo.util/src/org/argeo/util => org.argeo.api.cms/src/org/argeo/api/cms}/directory/HierarchyUnit.java (96%)
 rename {org.argeo.cms/src/org/argeo/cms/security => org.argeo.api.cms/src/org/argeo/api/cms/keyring}/CryptoKeyring.java (87%)
 rename {org.argeo.cms/src/org/argeo/cms/security => org.argeo.api.cms/src/org/argeo/api/cms/keyring}/Keyring.java (94%)
 rename {org.argeo.cms/src/org/argeo/cms/security => org.argeo.api.cms/src/org/argeo/api/cms/keyring}/PBEKeySpecCallback.java (97%)
 rename {org.argeo.cms/src/org/argeo/cms/security => org.argeo.api.cms/src/org/argeo/api/cms/keyring}/package-info.java (58%)
 rename {org.argeo.util/src/org/argeo/util => org.argeo.api.cms/src/org/argeo/api/cms}/transaction/AbstractWorkingCopy.java (96%)
 rename {org.argeo.util/src/org/argeo/util => org.argeo.api.cms/src/org/argeo/api/cms}/transaction/JtaStatusAdapter.java (97%)
 rename {org.argeo.util/src/org/argeo/util => org.argeo.api.cms/src/org/argeo/api/cms}/transaction/SimpleRollbackException.java (88%)
 rename {org.argeo.util/src/org/argeo/util => org.argeo.api.cms/src/org/argeo/api/cms}/transaction/SimpleTransaction.java (99%)
 rename {org.argeo.util/src/org/argeo/util => org.argeo.api.cms/src/org/argeo/api/cms}/transaction/SimpleTransactionManager.java (99%)
 rename {org.argeo.util/src/org/argeo/util => org.argeo.api.cms/src/org/argeo/api/cms}/transaction/TransactionStatusAdapter.java (90%)
 rename {org.argeo.util/src/org/argeo/util => org.argeo.api.cms/src/org/argeo/api/cms}/transaction/UuidXid.java (98%)
 rename {org.argeo.util/src/org/argeo/util => org.argeo.api.cms/src/org/argeo/api/cms}/transaction/WorkContext.java (86%)
 rename {org.argeo.util/src/org/argeo/util => org.argeo.api.cms/src/org/argeo/api/cms}/transaction/WorkControl.java (88%)
 rename {org.argeo.util/src/org/argeo/util => org.argeo.api.cms/src/org/argeo/api/cms}/transaction/WorkTransaction.java (86%)
 rename {org.argeo.util/src/org/argeo/util => org.argeo.api.cms/src/org/argeo/api/cms}/transaction/WorkingCopy.java (86%)
 rename {org.argeo.util/src/org/argeo/util => org.argeo.api.cms/src/org/argeo/api/cms}/transaction/WorkingCopyProcessor.java (81%)
 rename {org.argeo.util/src/org/argeo/util => org.argeo.api.cms/src/org/argeo/api/cms}/transaction/WorkingCopyXaResource.java (98%)
 rename {org.argeo.util/src/org/argeo/util => org.argeo.api.cms/src/org/argeo/api/cms}/transaction/XAResourceProvider.java (74%)
 rename {org.argeo.util/src/org/argeo/util => org.argeo.api.cms/src/org/argeo/api/cms}/transaction/package-info.java (65%)
 rename {org.argeo.util => org.argeo.api.register}/.classpath (100%)
 rename {org.argeo.util => org.argeo.api.register}/.project (94%)
 rename {org.argeo.util => org.argeo.api.register}/META-INF/.gitignore (100%)
 create mode 100644 org.argeo.api.register/bnd.bnd
 rename {org.argeo.util => org.argeo.api.register}/build.properties (100%)
 rename {org.argeo.util/src/org/argeo/util => org.argeo.api.register/src/org/argeo/api}/register/Component.java (99%)
 rename {org.argeo.util/src/org/argeo/util => org.argeo.api.register/src/org/argeo/api}/register/ComponentRegister.java (97%)
 rename {org.argeo.util/src/org/argeo/util => org.argeo.api.register/src/org/argeo/api}/register/RankingKey.java (98%)
 rename {org.argeo.util/src/org/argeo/util => org.argeo.api.register/src/org/argeo/api}/register/SimpleRegister.java (99%)
 rename org.argeo.cms/src/org/argeo/cms/{security => }/AbstractKeyring.java (97%)
 rename {org.argeo.util/src/org/argeo/util => org.argeo.cms/src/org/argeo/cms}/directory/ldap/AbstractLdapDirectory.java (96%)
 rename {org.argeo.util/src/org/argeo/util => org.argeo.cms/src/org/argeo/cms}/directory/ldap/AbstractLdapDirectoryDao.java (94%)
 rename {org.argeo.util/src/org/argeo/util => org.argeo.cms/src/org/argeo/cms}/directory/ldap/AttributesDictionary.java (99%)
 rename {org.argeo.util/src/org/argeo/util => org.argeo.cms/src/org/argeo/cms}/directory/ldap/AuthPassword.java (98%)
 rename {org.argeo.util/src/org/argeo/util => org.argeo.cms/src/org/argeo/cms}/directory/ldap/DefaultLdapEntry.java (98%)
 rename {org.argeo.util/src/org/argeo/util => org.argeo.cms/src/org/argeo/cms}/directory/ldap/IpaUtils.java (96%)
 rename {org.argeo.util/src/org/argeo/util => org.argeo.cms/src/org/argeo/cms}/directory/ldap/LdapConnection.java (97%)
 rename {org.argeo.util/src/org/argeo/util => org.argeo.cms/src/org/argeo/cms}/directory/ldap/LdapDao.java (97%)
 rename {org.argeo.util/src/org/argeo/util => org.argeo.cms/src/org/argeo/cms}/directory/ldap/LdapDirectoryDao.java (85%)
 rename {org.argeo.util/src/org/argeo/util => org.argeo.cms/src/org/argeo/cms}/directory/ldap/LdapEntry.java (95%)
 rename {org.argeo.util/src/org/argeo/util => org.argeo.cms/src/org/argeo/cms}/directory/ldap/LdapEntryWorkingCopy.java (82%)
 rename {org.argeo.util/src/org/argeo/util => org.argeo.cms/src/org/argeo/cms}/directory/ldap/LdapHierarchyUnit.java (94%)
 rename {org.argeo.util/src/org/argeo/util => org.argeo.cms/src/org/argeo/cms}/directory/ldap/LdapNameUtils.java (97%)
 rename {org.argeo.util/src/org/argeo/util => org.argeo.cms/src/org/argeo/cms}/directory/ldap/LdifDao.java (97%)
 rename {org.argeo.util/src/org/argeo/util => org.argeo.cms/src/org/argeo/cms}/directory/ldap/LdifParser.java (98%)
 rename {org.argeo.util/src/org/argeo/util => org.argeo.cms/src/org/argeo/cms}/directory/ldap/LdifWriter.java (93%)
 rename {org.argeo.util/src/org/argeo/util => org.argeo.cms/src/org/argeo/cms}/directory/ldap/SharedSecret.java (93%)
 rename {org.argeo.util/src/org/argeo/util/naming => org.argeo.cms/src/org/argeo/cms}/dns/DnsBrowser.java (99%)
 rename {org.argeo.util/src/org/argeo/util/naming => org.argeo.cms/src/org/argeo/cms}/dns/SrvRecord.java (97%)
 rename org.argeo.cms/src/org/argeo/cms/{security => file}/ChecksumFactory.java (99%)
 rename {org.argeo.util/src/org/argeo/util => org.argeo.cms/src/org/argeo/cms}/http/HttpHeader.java (95%)
 rename {org.argeo.util/src/org/argeo/util => org.argeo.cms/src/org/argeo/cms}/http/HttpMethod.java (87%)
 rename {org.argeo.util/src/org/argeo/util => org.argeo.cms/src/org/argeo/cms}/http/HttpServerUtils.java (98%)
 rename {org.argeo.util/src/org/argeo/util => org.argeo.cms/src/org/argeo/cms}/http/HttpStatus.java (98%)
 rename {org.argeo.util/src/org/argeo/osgi/util => org.argeo.cms/src/org/argeo/cms/osgi}/FilterRequirement.java (96%)
 rename {org.argeo.util/src/org/argeo => org.argeo.cms/src/org/argeo/cms}/osgi/useradmin/AggregatingAuthorization.java (97%)
 rename {org.argeo.util/src/org/argeo => org.argeo.cms/src/org/argeo/cms}/osgi/useradmin/AggregatingUserAdmin.java (98%)
 rename {org.argeo.util/src/org/argeo => org.argeo.cms/src/org/argeo/cms}/osgi/useradmin/AuthenticatingUser.java (95%)
 rename {org.argeo.util/src/org/argeo => org.argeo.cms/src/org/argeo/cms}/osgi/useradmin/DirectoryGroup.java (81%)
 rename {org.argeo.util/src/org/argeo => org.argeo.cms/src/org/argeo/cms}/osgi/useradmin/DirectoryUser.java (75%)
 rename {org.argeo.util/src/org/argeo => org.argeo.cms/src/org/argeo/cms}/osgi/useradmin/DirectoryUserAdmin.java (93%)
 rename {org.argeo.util/src/org/argeo => org.argeo.cms/src/org/argeo/cms}/osgi/useradmin/LdifAuthorization.java (96%)
 rename {org.argeo.util/src/org/argeo => org.argeo.cms/src/org/argeo/cms}/osgi/useradmin/LdifGroup.java (97%)
 rename {org.argeo.util/src/org/argeo => org.argeo.cms/src/org/argeo/cms}/osgi/useradmin/LdifUser.java (70%)
 rename {org.argeo.util/src/org/argeo => org.argeo.cms/src/org/argeo/cms}/osgi/useradmin/OsUserDirectory.java (87%)
 rename {org.argeo.util/src/org/argeo => org.argeo.cms/src/org/argeo/cms}/osgi/useradmin/OsUserUtils.java (97%)
 rename {org.argeo.util/src/org/argeo => org.argeo.cms/src/org/argeo/cms}/osgi/useradmin/TokenUtils.java (91%)
 rename {org.argeo.util/src/org/argeo => org.argeo.cms/src/org/argeo/cms}/osgi/useradmin/UserDirectory.java (74%)
 rename {org.argeo.util/src/org/argeo => org.argeo.cms/src/org/argeo/cms}/osgi/useradmin/jaas-os.cfg (100%)
 rename {org.argeo.util/src/org/argeo => org.argeo.cms/src/org/argeo/cms}/osgi/useradmin/package-info.java (61%)
 rename {org.argeo.util/src/org/argeo/util/directory => org.argeo.cms/src/org/argeo/cms/runtime}/DirectoryConf.java (97%)
 delete mode 100644 org.argeo.cms/src/org/argeo/cms/tabular/package-info.java
 rename {org.argeo.util/src/org/argeo => org.argeo.cms/src/org/argeo/cms}/util/CompositeString.java (99%)
 rename {org.argeo.util/src/org/argeo => org.argeo.cms/src/org/argeo/cms}/util/CsvParser.java (99%)
 rename {org.argeo.util/src/org/argeo => org.argeo.cms/src/org/argeo/cms}/util/CsvParserWithLinesAsMap.java (97%)
 rename {org.argeo.util/src/org/argeo => org.argeo.cms/src/org/argeo/cms}/util/CsvWriter.java (99%)
 rename {org.argeo.util/src/org/argeo => org.argeo.cms/src/org/argeo/cms}/util/CurrentSubject.java (98%)
 rename {org.argeo.util/src/org/argeo => org.argeo.cms/src/org/argeo/cms}/util/DictionaryKeys.java (96%)
 rename {org.argeo.util/src/org/argeo => org.argeo.cms/src/org/argeo/cms}/util/DigestUtils.java (99%)
 rename {org.argeo.util/src/org/argeo => org.argeo.cms/src/org/argeo/cms}/util/DirH.java (99%)
 rename {org.argeo.util/src/org/argeo => org.argeo.cms/src/org/argeo/cms}/util/ExceptionsChain.java (98%)
 rename {org.argeo.util/src/org/argeo => org.argeo.cms/src/org/argeo/cms}/util/FsUtils.java (98%)
 rename {org.argeo.util/src/org/argeo => org.argeo.cms/src/org/argeo/cms}/util/LangUtils.java (99%)
 rename {org.argeo.util/src/org/argeo => org.argeo.cms/src/org/argeo/cms}/util/OS.java (98%)
 rename {org.argeo.util/src/org/argeo => org.argeo.cms/src/org/argeo/cms}/util/PasswordEncryption.java (99%)
 rename {org.argeo.util/src/org/argeo => org.argeo.cms/src/org/argeo/cms}/util/ServiceChannel.java (98%)
 rename {org.argeo.util/src/org/argeo => org.argeo.cms/src/org/argeo/cms}/util/StreamUtils.java (98%)
 rename {org.argeo.util/src/org/argeo => org.argeo.cms/src/org/argeo/cms}/util/Tester.java (99%)
 rename {org.argeo.util/src/org/argeo => org.argeo.cms/src/org/argeo/cms}/util/TesterStatus.java (98%)
 rename {org.argeo.util/src/org/argeo => org.argeo.cms/src/org/argeo/cms}/util/Throughput.java (98%)
 rename {org.argeo.util/src/org/argeo => org.argeo.cms/src/org/argeo/cms}/util/package-info.java (53%)
 delete mode 100644 org.argeo.util/bnd.bnd
 delete mode 100644 org.argeo.util/src/org/argeo/osgi/internal/EnterpriseActivator.java
 delete mode 100644 org.argeo.util/src/org/argeo/osgi/provisioning/SimpleProvisioningService.java
 delete mode 100644 org.argeo.util/src/org/argeo/osgi/provisioning/package-info.java
 delete mode 100644 org.argeo.util/src/org/argeo/osgi/util/OnServiceRegistration.java
 delete mode 100644 org.argeo.util/src/org/argeo/osgi/util/OsgiRegister.java
 delete mode 100644 org.argeo.util/src/org/argeo/util/internal/DisplayQName.java
 delete mode 100644 org.argeo.util/src/org/argeo/util/naming/LdapAttrs.csv
 delete mode 100644 org.argeo.util/src/org/argeo/util/naming/LdapObjs.csv
 delete mode 100644 org.argeo.util/src/org/argeo/util/naming/package-info.java

diff --git a/Makefile b/Makefile
index 3d58eb0c0..330bc4fca 100644
--- a/Makefile
+++ b/Makefile
@@ -8,8 +8,8 @@ A2_CATEGORY = org.argeo.cms
 
 BUNDLES = \
 org.argeo.init \
-org.argeo.util \
 org.argeo.api.uuid \
+org.argeo.api.register \
 org.argeo.api.acr \
 org.argeo.api.cli \
 org.argeo.api.cms \
diff --git a/org.argeo.api.acr/src/org/argeo/api/acr/ArgeoNamespace.java b/org.argeo.api.acr/src/org/argeo/api/acr/ArgeoNamespace.java
new file mode 100644
index 000000000..98131d13e
--- /dev/null
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/ArgeoNamespace.java
@@ -0,0 +1,14 @@
+package org.argeo.api.acr;
+
+/** Namespaces declared by Argeo. */
+public enum ArgeoNamespace {
+	;
+
+	public final static String CR_NAMESPACE_URI = "http://www.argeo.org/ns/cr";
+	public final static String CR_DEFAULT_PREFIX = "cr";
+	public final static String LDAP_NAMESPACE_URI = "http://www.argeo.org/ns/ldap";
+	public final static String LDAP_DEFAULT_PREFIX = "ldap";
+	public final static String ROLE_NAMESPACE_URI = "http://www.argeo.org/ns/role";
+	public final static String ROLE_DEFAULT_PREFIX = "role";
+
+}
diff --git a/org.argeo.api.acr/src/org/argeo/api/acr/CrAttributeType.java b/org.argeo.api.acr/src/org/argeo/api/acr/CrAttributeType.java
index 55ad079ec..3e12fb1c8 100644
--- a/org.argeo.api.acr/src/org/argeo/api/acr/CrAttributeType.java
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/CrAttributeType.java
@@ -28,7 +28,7 @@ public enum CrAttributeType {
 	// we do not support short and float, like recent additions to Java
 	// (e.g. optional primitives)
 	DATE_TIME(Instant.class, W3C_XML_SCHEMA_NS_URI, "dateTime", new InstantFormatter()), //
-	UUID(UUID.class, CrName.CR_NAMESPACE_URI, "uuid", new UuidFormatter()), //
+	UUID(UUID.class, ArgeoNamespace.CR_NAMESPACE_URI, "uuid", new UuidFormatter()), //
 	ANY_URI(URI.class, W3C_XML_SCHEMA_NS_URI, "anyUri", new UriFormatter()), //
 	STRING(String.class, W3C_XML_SCHEMA_NS_URI, "string", new StringFormatter()), //
 	;
diff --git a/org.argeo.api.acr/src/org/argeo/api/acr/CrName.java b/org.argeo.api.acr/src/org/argeo/api/acr/CrName.java
index f61833507..ead47377b 100644
--- a/org.argeo.api.acr/src/org/argeo/api/acr/CrName.java
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/CrName.java
@@ -34,14 +34,7 @@ public enum CrName implements QNamed {
 	//
 	;
 
-	public final static String CR_NAMESPACE_URI = "http://www.argeo.org/ns/cr";
-	public final static String CR_DEFAULT_PREFIX = "cr";
-
-	public final static String LDAP_NAMESPACE_URI = "http://www.argeo.org/ns/ldap";
-	public final static String LDAP_DEFAULT_PREFIX = "ldap";
-
-	public final static String ROLE_NAMESPACE_URI = "http://www.argeo.org/ns/role";
-	public final static String ROLE_DEFAULT_PREFIX = "role";
+	
 
 //	private final ContentName value;
 
@@ -55,12 +48,12 @@ public enum CrName implements QNamed {
 
 	@Override
 	public String getNamespace() {
-		return CR_NAMESPACE_URI;
+		return ArgeoNamespace.CR_NAMESPACE_URI;
 	}
 
 	@Override
 	public String getDefaultPrefix() {
-		return CR_DEFAULT_PREFIX;
+		return ArgeoNamespace.CR_DEFAULT_PREFIX;
 	}
 
 }
diff --git a/org.argeo.api.acr/src/org/argeo/api/acr/RuntimeNamespaceContext.java b/org.argeo.api.acr/src/org/argeo/api/acr/RuntimeNamespaceContext.java
index 0941597d7..1c55156ee 100644
--- a/org.argeo.api.acr/src/org/argeo/api/acr/RuntimeNamespaceContext.java
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/RuntimeNamespaceContext.java
@@ -61,9 +61,9 @@ public class RuntimeNamespaceContext implements NamespaceContext {
 		register(XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI, XSD_INSTANCE_DEFAULT_PREFIX);
 
 		// Argeo specific
-		register(CrName.CR_NAMESPACE_URI, CrName.CR_DEFAULT_PREFIX);
-		register(CrName.LDAP_NAMESPACE_URI, CrName.LDAP_DEFAULT_PREFIX);
-		register(CrName.ROLE_NAMESPACE_URI, CrName.ROLE_DEFAULT_PREFIX);
+		register(ArgeoNamespace.CR_NAMESPACE_URI, ArgeoNamespace.CR_DEFAULT_PREFIX);
+		register(ArgeoNamespace.LDAP_NAMESPACE_URI, ArgeoNamespace.LDAP_DEFAULT_PREFIX);
+		register(ArgeoNamespace.ROLE_NAMESPACE_URI, ArgeoNamespace.ROLE_DEFAULT_PREFIX);
 	}
 
 	public static NamespaceContext getNamespaceContext() {
diff --git a/org.argeo.util/src/org/argeo/util/naming/Distinguished.java b/org.argeo.api.acr/src/org/argeo/api/acr/ldap/Distinguished.java
similarity index 96%
rename from org.argeo.util/src/org/argeo/util/naming/Distinguished.java
rename to org.argeo.api.acr/src/org/argeo/api/acr/ldap/Distinguished.java
index e339edeef..52556cf22 100644
--- a/org.argeo.util/src/org/argeo/util/naming/Distinguished.java
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/ldap/Distinguished.java
@@ -1,4 +1,4 @@
-package org.argeo.util.naming;
+package org.argeo.api.acr.ldap;
 
 import java.util.EnumSet;
 import java.util.Set;
diff --git a/org.argeo.util/src/org/argeo/util/naming/LdapAttrs.java b/org.argeo.api.acr/src/org/argeo/api/acr/ldap/LdapAttrs.java
similarity index 93%
rename from org.argeo.util/src/org/argeo/util/naming/LdapAttrs.java
rename to org.argeo.api.acr/src/org/argeo/api/acr/ldap/LdapAttrs.java
index 1a6642f05..b5af7526f 100644
--- a/org.argeo.util/src/org/argeo/util/naming/LdapAttrs.java
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/ldap/LdapAttrs.java
@@ -1,10 +1,15 @@
-package org.argeo.util.naming;
+package org.argeo.api.acr.ldap;
+
+import static org.argeo.api.acr.ArgeoNamespace.LDAP_DEFAULT_PREFIX;
+import static org.argeo.api.acr.ArgeoNamespace.LDAP_NAMESPACE_URI;
 
 import java.util.function.Supplier;
 
 import javax.xml.namespace.QName;
 
-import org.argeo.util.internal.DisplayQName;
+import org.argeo.api.acr.ContentName;
+import org.argeo.api.acr.QNamed;
+import org.argeo.api.acr.RuntimeNamespaceContext;
 
 /**
  * Standard LDAP attributes as per:<br>
@@ -13,7 +18,7 @@ import org.argeo.util.internal.DisplayQName;
  * "https://github.com/krb5/krb5/blob/master/src/plugins/kdb/ldap/libkdb_ldap/kerberos.schema">Kerberos
  * LDAP (partial)</a>
  */
-public enum LdapAttrs implements SpecifiedName, Supplier<String> {
+public enum LdapAttrs implements QNamed, SpecifiedName, Supplier<String> {
 	/** */
 	uid("0.9.2342.19200300.100.1.1", "RFC 4519"),
 	/** */
@@ -307,15 +312,13 @@ public enum LdapAttrs implements SpecifiedName, Supplier<String> {
 
 	public final static String DN = "dn";
 
-//	private final static String LDAP_ = "ldap:";
-
 	private final String oid, spec;
 	private final QName value;
 
 	LdapAttrs(String oid, String spec) {
 		this.oid = oid;
 		this.spec = spec;
-		this.value = new DisplayQName(LdapObjs.LDAP_NAMESPACE_URI, name(), LdapObjs.LDAP_DEFAULT_PREFIX);
+		this.value = new ContentName(LDAP_NAMESPACE_URI, name());
 	}
 
 	public QName qName() {
@@ -344,7 +347,7 @@ public enum LdapAttrs implements SpecifiedName, Supplier<String> {
 
 	@Override
 	public String get() {
-		return LdapObjs.LDAP_DEFAULT_PREFIX + ":" + name();
+		return RuntimeNamespaceContext.getNamespaceContext().getPrefix(LDAP_NAMESPACE_URI) + ":" + name();
 	}
 
 	@Override
@@ -353,4 +356,14 @@ public enum LdapAttrs implements SpecifiedName, Supplier<String> {
 		return name();
 	}
 
+	@Override
+	public String getNamespace() {
+		return LDAP_NAMESPACE_URI;
+	}
+
+	@Override
+	public String getDefaultPrefix() {
+		return LDAP_DEFAULT_PREFIX;
+	}
+
 }
diff --git a/org.argeo.util/src/org/argeo/util/naming/LdapObjs.java b/org.argeo.api.acr/src/org/argeo/api/acr/ldap/LdapObjs.java
similarity index 81%
rename from org.argeo.util/src/org/argeo/util/naming/LdapObjs.java
rename to org.argeo.api.acr/src/org/argeo/api/acr/ldap/LdapObjs.java
index 995c68cc9..45c8a5428 100644
--- a/org.argeo.util/src/org/argeo/util/naming/LdapObjs.java
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/ldap/LdapObjs.java
@@ -1,17 +1,23 @@
-package org.argeo.util.naming;
+package org.argeo.api.acr.ldap;
+
+import static org.argeo.api.acr.ArgeoNamespace.LDAP_DEFAULT_PREFIX;
+import static org.argeo.api.acr.ArgeoNamespace.LDAP_NAMESPACE_URI;
 
 import java.util.function.Supplier;
 
 import javax.xml.namespace.QName;
 
-import org.argeo.util.internal.DisplayQName;
+import org.argeo.api.acr.ArgeoNamespace;
+import org.argeo.api.acr.ContentName;
+import org.argeo.api.acr.QNamed;
+import org.argeo.api.acr.RuntimeNamespaceContext;
 
 /**
  * Standard LDAP object classes as per
  * <a href="https://www.ldap.com/ldap-oid-reference">https://www.ldap.com/ldap-
  * oid-reference</a>
  */
-public enum LdapObjs implements SpecifiedName, Supplier<String> {
+public enum LdapObjs implements QNamed, SpecifiedName, Supplier<String> {
 	account("0.9.2342.19200300.100.4.5", "RFC 4524"),
 	/** */
 	document("0.9.2342.19200300.100.4.6", "RFC 4524"),
@@ -106,18 +112,13 @@ public enum LdapObjs implements SpecifiedName, Supplier<String> {
 	//
 	;
 
-	/** MUST be equal to ContentRepository LDAP namespace. */
-	final static String LDAP_NAMESPACE_URI = "http://www.argeo.org/ns/ldap";
-	/** MUST be equal to ContentRepository LDAP prefix. */
-	final static String LDAP_DEFAULT_PREFIX = "ldap";
-
 	private final String oid, spec;
 	private final QName value;
 
 	private LdapObjs(String oid, String spec) {
 		this.oid = oid;
 		this.spec = spec;
-		this.value = new DisplayQName(LDAP_NAMESPACE_URI, name(), LDAP_DEFAULT_PREFIX);
+		this.value = new ContentName(ArgeoNamespace.LDAP_NAMESPACE_URI, name());
 	}
 
 	public QName qName() {
@@ -139,7 +140,17 @@ public enum LdapObjs implements SpecifiedName, Supplier<String> {
 
 	@Override
 	public String get() {
-		return LdapObjs.LDAP_DEFAULT_PREFIX + ":" + name();
+		return RuntimeNamespaceContext.getNamespaceContext().getPrefix(LDAP_NAMESPACE_URI) + ":" + name();
+	}
+
+	@Override
+	public String getNamespace() {
+		return LDAP_NAMESPACE_URI;
+	}
+
+	@Override
+	public String getDefaultPrefix() {
+		return LDAP_DEFAULT_PREFIX;
 	}
 
 }
diff --git a/org.argeo.util/src/org/argeo/util/naming/NamingUtils.java b/org.argeo.api.acr/src/org/argeo/api/acr/ldap/NamingUtils.java
similarity index 99%
rename from org.argeo.util/src/org/argeo/util/naming/NamingUtils.java
rename to org.argeo.api.acr/src/org/argeo/api/acr/ldap/NamingUtils.java
index ff4ed31b4..9f7ec61d8 100644
--- a/org.argeo.util/src/org/argeo/util/naming/NamingUtils.java
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/ldap/NamingUtils.java
@@ -1,4 +1,4 @@
-package org.argeo.util.naming;
+package org.argeo.api.acr.ldap;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
diff --git a/org.argeo.util/src/org/argeo/util/naming/NodeOID.java b/org.argeo.api.acr/src/org/argeo/api/acr/ldap/NodeOID.java
similarity index 93%
rename from org.argeo.util/src/org/argeo/util/naming/NodeOID.java
rename to org.argeo.api.acr/src/org/argeo/api/acr/ldap/NodeOID.java
index ea163d6a4..a68b6cb8b 100644
--- a/org.argeo.util/src/org/argeo/util/naming/NodeOID.java
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/ldap/NodeOID.java
@@ -1,4 +1,4 @@
-package org.argeo.util.naming;
+package org.argeo.api.acr.ldap;
 
 interface NodeOID {
 	String BASE = "1.3.6.1.4.1" + ".48308" + ".1";
diff --git a/org.argeo.util/src/org/argeo/util/naming/SpecifiedName.java b/org.argeo.api.acr/src/org/argeo/api/acr/ldap/SpecifiedName.java
similarity index 91%
rename from org.argeo.util/src/org/argeo/util/naming/SpecifiedName.java
rename to org.argeo.api.acr/src/org/argeo/api/acr/ldap/SpecifiedName.java
index 22f2a2d69..5de8ab253 100644
--- a/org.argeo.util/src/org/argeo/util/naming/SpecifiedName.java
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/ldap/SpecifiedName.java
@@ -1,4 +1,4 @@
-package org.argeo.util.naming;
+package org.argeo.api.acr.ldap;
 
 /**
  * A name which has been specified and for which an id has been defined
diff --git a/org.argeo.cms/src/org/argeo/cms/tabular/ArrayTabularRow.java b/org.argeo.api.acr/src/org/argeo/api/acr/tabular/ArrayTabularRow.java
similarity index 91%
rename from org.argeo.cms/src/org/argeo/cms/tabular/ArrayTabularRow.java
rename to org.argeo.api.acr/src/org/argeo/api/acr/tabular/ArrayTabularRow.java
index cfd482729..c0efe87ff 100644
--- a/org.argeo.cms/src/org/argeo/cms/tabular/ArrayTabularRow.java
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/tabular/ArrayTabularRow.java
@@ -1,4 +1,4 @@
-package org.argeo.cms.tabular;
+package org.argeo.api.acr.tabular;
 
 import java.util.List;
 
diff --git a/org.argeo.cms/src/org/argeo/cms/tabular/TabularColumn.java b/org.argeo.api.acr/src/org/argeo/api/acr/tabular/TabularColumn.java
similarity index 95%
rename from org.argeo.cms/src/org/argeo/cms/tabular/TabularColumn.java
rename to org.argeo.api.acr/src/org/argeo/api/acr/tabular/TabularColumn.java
index 7f7ac1e61..5b9bf239a 100644
--- a/org.argeo.cms/src/org/argeo/cms/tabular/TabularColumn.java
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/tabular/TabularColumn.java
@@ -1,4 +1,4 @@
-package org.argeo.cms.tabular;
+package org.argeo.api.acr.tabular;
 
 /** The column in a tabular content */
 public class TabularColumn {
diff --git a/org.argeo.cms/src/org/argeo/cms/tabular/TabularContent.java b/org.argeo.api.acr/src/org/argeo/api/acr/tabular/TabularContent.java
similarity index 91%
rename from org.argeo.cms/src/org/argeo/cms/tabular/TabularContent.java
rename to org.argeo.api.acr/src/org/argeo/api/acr/tabular/TabularContent.java
index c6d2ab88d..ae6eb4e2a 100644
--- a/org.argeo.cms/src/org/argeo/cms/tabular/TabularContent.java
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/tabular/TabularContent.java
@@ -1,4 +1,4 @@
-package org.argeo.cms.tabular;
+package org.argeo.api.acr.tabular;
 
 import java.util.List;
 
diff --git a/org.argeo.cms/src/org/argeo/cms/tabular/TabularRow.java b/org.argeo.api.acr/src/org/argeo/api/acr/tabular/TabularRow.java
similarity index 87%
rename from org.argeo.cms/src/org/argeo/cms/tabular/TabularRow.java
rename to org.argeo.api.acr/src/org/argeo/api/acr/tabular/TabularRow.java
index 69b973252..5302cc04f 100644
--- a/org.argeo.cms/src/org/argeo/cms/tabular/TabularRow.java
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/tabular/TabularRow.java
@@ -1,4 +1,4 @@
-package org.argeo.cms.tabular;
+package org.argeo.api.acr.tabular;
 
 /** A row of tabular data */
 public interface TabularRow {
diff --git a/org.argeo.cms/src/org/argeo/cms/tabular/TabularRowIterator.java b/org.argeo.api.acr/src/org/argeo/api/acr/tabular/TabularRowIterator.java
similarity index 89%
rename from org.argeo.cms/src/org/argeo/cms/tabular/TabularRowIterator.java
rename to org.argeo.api.acr/src/org/argeo/api/acr/tabular/TabularRowIterator.java
index 7ad8719e5..768c593ad 100644
--- a/org.argeo.cms/src/org/argeo/cms/tabular/TabularRowIterator.java
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/tabular/TabularRowIterator.java
@@ -1,4 +1,4 @@
-package org.argeo.cms.tabular;
+package org.argeo.api.acr.tabular;
 
 import java.util.Iterator;
 
diff --git a/org.argeo.cms/src/org/argeo/cms/tabular/TabularWriter.java b/org.argeo.api.acr/src/org/argeo/api/acr/tabular/TabularWriter.java
similarity index 86%
rename from org.argeo.cms/src/org/argeo/cms/tabular/TabularWriter.java
rename to org.argeo.api.acr/src/org/argeo/api/acr/tabular/TabularWriter.java
index 34fc85b7f..f1d555f6c 100644
--- a/org.argeo.cms/src/org/argeo/cms/tabular/TabularWriter.java
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/tabular/TabularWriter.java
@@ -1,4 +1,4 @@
-package org.argeo.cms.tabular;
+package org.argeo.api.acr.tabular;
 
 
 /** Write to a tabular content */
diff --git a/org.argeo.api.acr/src/org/argeo/api/acr/tabular/package-info.java b/org.argeo.api.acr/src/org/argeo/api/acr/tabular/package-info.java
new file mode 100644
index 000000000..06acbc587
--- /dev/null
+++ b/org.argeo.api.acr/src/org/argeo/api/acr/tabular/package-info.java
@@ -0,0 +1,2 @@
+/** Tabular format API. */
+package org.argeo.api.acr.tabular;
\ No newline at end of file
diff --git a/org.argeo.util/src/org/argeo/util/directory/Directory.java b/org.argeo.api.cms/src/org/argeo/api/cms/directory/Directory.java
similarity index 89%
rename from org.argeo.util/src/org/argeo/util/directory/Directory.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/directory/Directory.java
index 988658969..7ed61ebc6 100644
--- a/org.argeo.util/src/org/argeo/util/directory/Directory.java
+++ b/org.argeo.api.cms/src/org/argeo/api/cms/directory/Directory.java
@@ -1,8 +1,8 @@
-package org.argeo.util.directory;
+package org.argeo.api.cms.directory;
 
 import java.util.Optional;
 
-import org.argeo.util.transaction.WorkControl;
+import org.argeo.api.cms.transaction.WorkControl;
 
 /** An information directory (typicylly LDAP). */
 public interface Directory extends HierarchyUnit {
diff --git a/org.argeo.util/src/org/argeo/util/directory/DirectoryDigestUtils.java b/org.argeo.api.cms/src/org/argeo/api/cms/directory/DirectoryDigestUtils.java
similarity index 99%
rename from org.argeo.util/src/org/argeo/util/directory/DirectoryDigestUtils.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/directory/DirectoryDigestUtils.java
index d07d2d2ed..dabcfe8ee 100644
--- a/org.argeo.util/src/org/argeo/util/directory/DirectoryDigestUtils.java
+++ b/org.argeo.api.cms/src/org/argeo/api/cms/directory/DirectoryDigestUtils.java
@@ -1,4 +1,4 @@
-package org.argeo.util.directory;
+package org.argeo.api.cms.directory;
 
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
diff --git a/org.argeo.util/src/org/argeo/util/directory/HierarchyUnit.java b/org.argeo.api.cms/src/org/argeo/api/cms/directory/HierarchyUnit.java
similarity index 96%
rename from org.argeo.util/src/org/argeo/util/directory/HierarchyUnit.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/directory/HierarchyUnit.java
index 947b6bc85..04593d94e 100644
--- a/org.argeo.util/src/org/argeo/util/directory/HierarchyUnit.java
+++ b/org.argeo.api.cms/src/org/argeo/api/cms/directory/HierarchyUnit.java
@@ -1,4 +1,4 @@
-package org.argeo.util.directory;
+package org.argeo.api.cms.directory;
 
 import java.util.Dictionary;
 import java.util.Locale;
diff --git a/org.argeo.cms/src/org/argeo/cms/security/CryptoKeyring.java b/org.argeo.api.cms/src/org/argeo/api/cms/keyring/CryptoKeyring.java
similarity index 87%
rename from org.argeo.cms/src/org/argeo/cms/security/CryptoKeyring.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/keyring/CryptoKeyring.java
index df26c6b41..454f8b4a9 100644
--- a/org.argeo.cms/src/org/argeo/cms/security/CryptoKeyring.java
+++ b/org.argeo.api.cms/src/org/argeo/api/cms/keyring/CryptoKeyring.java
@@ -1,4 +1,4 @@
-package org.argeo.cms.security;
+package org.argeo.api.cms.keyring;
 
 /**
  * Marker interface for an advanced keyring based on cryptography.
diff --git a/org.argeo.cms/src/org/argeo/cms/security/Keyring.java b/org.argeo.api.cms/src/org/argeo/api/cms/keyring/Keyring.java
similarity index 94%
rename from org.argeo.cms/src/org/argeo/cms/security/Keyring.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/keyring/Keyring.java
index 53740c693..efc9455eb 100644
--- a/org.argeo.cms/src/org/argeo/cms/security/Keyring.java
+++ b/org.argeo.api.cms/src/org/argeo/api/cms/keyring/Keyring.java
@@ -1,4 +1,4 @@
-package org.argeo.cms.security;
+package org.argeo.api.cms.keyring;
 
 import java.io.InputStream;
 
diff --git a/org.argeo.cms/src/org/argeo/cms/security/PBEKeySpecCallback.java b/org.argeo.api.cms/src/org/argeo/api/cms/keyring/PBEKeySpecCallback.java
similarity index 97%
rename from org.argeo.cms/src/org/argeo/cms/security/PBEKeySpecCallback.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/keyring/PBEKeySpecCallback.java
index 13e8d753b..6a7ce19fb 100644
--- a/org.argeo.cms/src/org/argeo/cms/security/PBEKeySpecCallback.java
+++ b/org.argeo.api.cms/src/org/argeo/api/cms/keyring/PBEKeySpecCallback.java
@@ -1,4 +1,4 @@
-package org.argeo.cms.security;
+package org.argeo.api.cms.keyring;
 
 import javax.crypto.spec.PBEKeySpec;
 import javax.security.auth.callback.Callback;
diff --git a/org.argeo.cms/src/org/argeo/cms/security/package-info.java b/org.argeo.api.cms/src/org/argeo/api/cms/keyring/package-info.java
similarity index 58%
rename from org.argeo.cms/src/org/argeo/cms/security/package-info.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/keyring/package-info.java
index e99405436..7f61e09b0 100644
--- a/org.argeo.cms/src/org/argeo/cms/security/package-info.java
+++ b/org.argeo.api.cms/src/org/argeo/api/cms/keyring/package-info.java
@@ -1,2 +1,2 @@
 /** Argeo CMS reusable security components. */
-package org.argeo.cms.security;
\ No newline at end of file
+package org.argeo.api.cms.keyring;
\ No newline at end of file
diff --git a/org.argeo.util/src/org/argeo/util/transaction/AbstractWorkingCopy.java b/org.argeo.api.cms/src/org/argeo/api/cms/transaction/AbstractWorkingCopy.java
similarity index 96%
rename from org.argeo.util/src/org/argeo/util/transaction/AbstractWorkingCopy.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/transaction/AbstractWorkingCopy.java
index 0da35ac7b..928acad2c 100644
--- a/org.argeo.util/src/org/argeo/util/transaction/AbstractWorkingCopy.java
+++ b/org.argeo.api.cms/src/org/argeo/api/cms/transaction/AbstractWorkingCopy.java
@@ -1,4 +1,4 @@
-package org.argeo.util.transaction;
+package org.argeo.api.cms.transaction;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/org.argeo.util/src/org/argeo/util/transaction/JtaStatusAdapter.java b/org.argeo.api.cms/src/org/argeo/api/cms/transaction/JtaStatusAdapter.java
similarity index 97%
rename from org.argeo.util/src/org/argeo/util/transaction/JtaStatusAdapter.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/transaction/JtaStatusAdapter.java
index bd977069f..2ba6c0dae 100644
--- a/org.argeo.util/src/org/argeo/util/transaction/JtaStatusAdapter.java
+++ b/org.argeo.api.cms/src/org/argeo/api/cms/transaction/JtaStatusAdapter.java
@@ -1,4 +1,4 @@
-package org.argeo.util.transaction;
+package org.argeo.api.cms.transaction;
 
 /** JTA transaction status. */
 public class JtaStatusAdapter implements TransactionStatusAdapter<Integer> {
diff --git a/org.argeo.util/src/org/argeo/util/transaction/SimpleRollbackException.java b/org.argeo.api.cms/src/org/argeo/api/cms/transaction/SimpleRollbackException.java
similarity index 88%
rename from org.argeo.util/src/org/argeo/util/transaction/SimpleRollbackException.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/transaction/SimpleRollbackException.java
index 010b549c7..39ed9b9a0 100644
--- a/org.argeo.util/src/org/argeo/util/transaction/SimpleRollbackException.java
+++ b/org.argeo.api.cms/src/org/argeo/api/cms/transaction/SimpleRollbackException.java
@@ -1,4 +1,4 @@
-package org.argeo.util.transaction;
+package org.argeo.api.cms.transaction;
 
 /** Internal unchecked rollback exception. */
 class SimpleRollbackException extends RuntimeException {
diff --git a/org.argeo.util/src/org/argeo/util/transaction/SimpleTransaction.java b/org.argeo.api.cms/src/org/argeo/api/cms/transaction/SimpleTransaction.java
similarity index 99%
rename from org.argeo.util/src/org/argeo/util/transaction/SimpleTransaction.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/transaction/SimpleTransaction.java
index 56ef06353..f2bb9078c 100644
--- a/org.argeo.util/src/org/argeo/util/transaction/SimpleTransaction.java
+++ b/org.argeo.api.cms/src/org/argeo/api/cms/transaction/SimpleTransaction.java
@@ -1,4 +1,4 @@
-package org.argeo.util.transaction;
+package org.argeo.api.cms.transaction;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/org.argeo.util/src/org/argeo/util/transaction/SimpleTransactionManager.java b/org.argeo.api.cms/src/org/argeo/api/cms/transaction/SimpleTransactionManager.java
similarity index 99%
rename from org.argeo.util/src/org/argeo/util/transaction/SimpleTransactionManager.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/transaction/SimpleTransactionManager.java
index f5be7c8e5..ee99ccb19 100644
--- a/org.argeo.util/src/org/argeo/util/transaction/SimpleTransactionManager.java
+++ b/org.argeo.api.cms/src/org/argeo/api/cms/transaction/SimpleTransactionManager.java
@@ -1,4 +1,4 @@
-package org.argeo.util.transaction;
+package org.argeo.api.cms.transaction;
 
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/org.argeo.util/src/org/argeo/util/transaction/TransactionStatusAdapter.java b/org.argeo.api.cms/src/org/argeo/api/cms/transaction/TransactionStatusAdapter.java
similarity index 90%
rename from org.argeo.util/src/org/argeo/util/transaction/TransactionStatusAdapter.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/transaction/TransactionStatusAdapter.java
index a74fef1c9..ab4effd55 100644
--- a/org.argeo.util/src/org/argeo/util/transaction/TransactionStatusAdapter.java
+++ b/org.argeo.api.cms/src/org/argeo/api/cms/transaction/TransactionStatusAdapter.java
@@ -1,4 +1,4 @@
-package org.argeo.util.transaction;
+package org.argeo.api.cms.transaction;
 
 /** Abstract the various approaches to represent transaction status. */
 public interface TransactionStatusAdapter<T> {
diff --git a/org.argeo.util/src/org/argeo/util/transaction/UuidXid.java b/org.argeo.api.cms/src/org/argeo/api/cms/transaction/UuidXid.java
similarity index 98%
rename from org.argeo.util/src/org/argeo/util/transaction/UuidXid.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/transaction/UuidXid.java
index b6acebec1..83358a5ae 100644
--- a/org.argeo.util/src/org/argeo/util/transaction/UuidXid.java
+++ b/org.argeo.api.cms/src/org/argeo/api/cms/transaction/UuidXid.java
@@ -1,4 +1,4 @@
-package org.argeo.util.transaction;
+package org.argeo.api.cms.transaction;
 
 import java.io.Serializable;
 import java.nio.ByteBuffer;
diff --git a/org.argeo.util/src/org/argeo/util/transaction/WorkContext.java b/org.argeo.api.cms/src/org/argeo/api/cms/transaction/WorkContext.java
similarity index 86%
rename from org.argeo.util/src/org/argeo/util/transaction/WorkContext.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/transaction/WorkContext.java
index e818b830f..5493dde91 100644
--- a/org.argeo.util/src/org/argeo/util/transaction/WorkContext.java
+++ b/org.argeo.api.cms/src/org/argeo/api/cms/transaction/WorkContext.java
@@ -1,4 +1,4 @@
-package org.argeo.util.transaction;
+package org.argeo.api.cms.transaction;
 
 import javax.transaction.xa.XAResource;
 
diff --git a/org.argeo.util/src/org/argeo/util/transaction/WorkControl.java b/org.argeo.api.cms/src/org/argeo/api/cms/transaction/WorkControl.java
similarity index 88%
rename from org.argeo.util/src/org/argeo/util/transaction/WorkControl.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/transaction/WorkControl.java
index db0e475a3..de03150c5 100644
--- a/org.argeo.util/src/org/argeo/util/transaction/WorkControl.java
+++ b/org.argeo.api.cms/src/org/argeo/api/cms/transaction/WorkControl.java
@@ -1,4 +1,4 @@
-package org.argeo.util.transaction;
+package org.argeo.api.cms.transaction;
 
 import java.util.concurrent.Callable;
 
diff --git a/org.argeo.util/src/org/argeo/util/transaction/WorkTransaction.java b/org.argeo.api.cms/src/org/argeo/api/cms/transaction/WorkTransaction.java
similarity index 86%
rename from org.argeo.util/src/org/argeo/util/transaction/WorkTransaction.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/transaction/WorkTransaction.java
index 245ca41af..39c188d54 100644
--- a/org.argeo.util/src/org/argeo/util/transaction/WorkTransaction.java
+++ b/org.argeo.api.cms/src/org/argeo/api/cms/transaction/WorkTransaction.java
@@ -1,4 +1,4 @@
-package org.argeo.util.transaction;
+package org.argeo.api.cms.transaction;
 
 /**
  * A minimalistic interface inspired by JTA user transaction in order to commit
diff --git a/org.argeo.util/src/org/argeo/util/transaction/WorkingCopy.java b/org.argeo.api.cms/src/org/argeo/api/cms/transaction/WorkingCopy.java
similarity index 86%
rename from org.argeo.util/src/org/argeo/util/transaction/WorkingCopy.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/transaction/WorkingCopy.java
index 9dd3fc537..c79423c8c 100644
--- a/org.argeo.util/src/org/argeo/util/transaction/WorkingCopy.java
+++ b/org.argeo.api.cms/src/org/argeo/api/cms/transaction/WorkingCopy.java
@@ -1,4 +1,4 @@
-package org.argeo.util.transaction;
+package org.argeo.api.cms.transaction;
 
 import java.util.Map;
 
diff --git a/org.argeo.util/src/org/argeo/util/transaction/WorkingCopyProcessor.java b/org.argeo.api.cms/src/org/argeo/api/cms/transaction/WorkingCopyProcessor.java
similarity index 81%
rename from org.argeo.util/src/org/argeo/util/transaction/WorkingCopyProcessor.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/transaction/WorkingCopyProcessor.java
index cdd640488..9e7c9e187 100644
--- a/org.argeo.util/src/org/argeo/util/transaction/WorkingCopyProcessor.java
+++ b/org.argeo.api.cms/src/org/argeo/api/cms/transaction/WorkingCopyProcessor.java
@@ -1,4 +1,4 @@
-package org.argeo.util.transaction;
+package org.argeo.api.cms.transaction;
 
 public interface WorkingCopyProcessor<WC extends WorkingCopy<?, ?, ?>> {
 	void prepare(WC wc);
diff --git a/org.argeo.util/src/org/argeo/util/transaction/WorkingCopyXaResource.java b/org.argeo.api.cms/src/org/argeo/api/cms/transaction/WorkingCopyXaResource.java
similarity index 98%
rename from org.argeo.util/src/org/argeo/util/transaction/WorkingCopyXaResource.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/transaction/WorkingCopyXaResource.java
index ddb605a19..16b08c287 100644
--- a/org.argeo.util/src/org/argeo/util/transaction/WorkingCopyXaResource.java
+++ b/org.argeo.api.cms/src/org/argeo/api/cms/transaction/WorkingCopyXaResource.java
@@ -1,4 +1,4 @@
-package org.argeo.util.transaction;
+package org.argeo.api.cms.transaction;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/org.argeo.util/src/org/argeo/util/transaction/XAResourceProvider.java b/org.argeo.api.cms/src/org/argeo/api/cms/transaction/XAResourceProvider.java
similarity index 74%
rename from org.argeo.util/src/org/argeo/util/transaction/XAResourceProvider.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/transaction/XAResourceProvider.java
index b0b211bad..904fb5f48 100644
--- a/org.argeo.util/src/org/argeo/util/transaction/XAResourceProvider.java
+++ b/org.argeo.api.cms/src/org/argeo/api/cms/transaction/XAResourceProvider.java
@@ -1,4 +1,4 @@
-package org.argeo.util.transaction;
+package org.argeo.api.cms.transaction;
 
 import javax.transaction.xa.XAResource;
 
diff --git a/org.argeo.util/src/org/argeo/util/transaction/package-info.java b/org.argeo.api.cms/src/org/argeo/api/cms/transaction/package-info.java
similarity index 65%
rename from org.argeo.util/src/org/argeo/util/transaction/package-info.java
rename to org.argeo.api.cms/src/org/argeo/api/cms/transaction/package-info.java
index f4811613d..bbb9212bc 100644
--- a/org.argeo.util/src/org/argeo/util/transaction/package-info.java
+++ b/org.argeo.api.cms/src/org/argeo/api/cms/transaction/package-info.java
@@ -1,2 +1,2 @@
 /** Minimalistic and partial XA transaction manager implementation. */
-package org.argeo.util.transaction;
\ No newline at end of file
+package org.argeo.api.cms.transaction;
\ No newline at end of file
diff --git a/org.argeo.util/.classpath b/org.argeo.api.register/.classpath
similarity index 100%
rename from org.argeo.util/.classpath
rename to org.argeo.api.register/.classpath
diff --git a/org.argeo.util/.project b/org.argeo.api.register/.project
similarity index 94%
rename from org.argeo.util/.project
rename to org.argeo.api.register/.project
index 171ff88dc..a3164c111 100644
--- a/org.argeo.util/.project
+++ b/org.argeo.api.register/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.argeo.util</name>
+	<name>org.argeo.api.register</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/org.argeo.util/META-INF/.gitignore b/org.argeo.api.register/META-INF/.gitignore
similarity index 100%
rename from org.argeo.util/META-INF/.gitignore
rename to org.argeo.api.register/META-INF/.gitignore
diff --git a/org.argeo.api.register/bnd.bnd b/org.argeo.api.register/bnd.bnd
new file mode 100644
index 000000000..bcebf3722
--- /dev/null
+++ b/org.argeo.api.register/bnd.bnd
@@ -0,0 +1,3 @@
+Import-Package:	org.osgi.*;version=0.0.0,\
+!org.apache.commons.logging,\
+*				
diff --git a/org.argeo.util/build.properties b/org.argeo.api.register/build.properties
similarity index 100%
rename from org.argeo.util/build.properties
rename to org.argeo.api.register/build.properties
diff --git a/org.argeo.util/src/org/argeo/util/register/Component.java b/org.argeo.api.register/src/org/argeo/api/register/Component.java
similarity index 99%
rename from org.argeo.util/src/org/argeo/util/register/Component.java
rename to org.argeo.api.register/src/org/argeo/api/register/Component.java
index 275811e9d..f4676d9cf 100644
--- a/org.argeo.util/src/org/argeo/util/register/Component.java
+++ b/org.argeo.api.register/src/org/argeo/api/register/Component.java
@@ -1,4 +1,4 @@
-package org.argeo.util.register;
+package org.argeo.api.register;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/org.argeo.util/src/org/argeo/util/register/ComponentRegister.java b/org.argeo.api.register/src/org/argeo/api/register/ComponentRegister.java
similarity index 97%
rename from org.argeo.util/src/org/argeo/util/register/ComponentRegister.java
rename to org.argeo.api.register/src/org/argeo/api/register/ComponentRegister.java
index d78b6badb..1bb9036f8 100644
--- a/org.argeo.util/src/org/argeo/util/register/ComponentRegister.java
+++ b/org.argeo.api.register/src/org/argeo/api/register/ComponentRegister.java
@@ -1,4 +1,4 @@
-package org.argeo.util.register;
+package org.argeo.api.register;
 
 import java.util.Map;
 import java.util.SortedSet;
diff --git a/org.argeo.util/src/org/argeo/util/register/RankingKey.java b/org.argeo.api.register/src/org/argeo/api/register/RankingKey.java
similarity index 98%
rename from org.argeo.util/src/org/argeo/util/register/RankingKey.java
rename to org.argeo.api.register/src/org/argeo/api/register/RankingKey.java
index 7a43e359e..3886afe65 100644
--- a/org.argeo.util/src/org/argeo/util/register/RankingKey.java
+++ b/org.argeo.api.register/src/org/argeo/api/register/RankingKey.java
@@ -1,4 +1,4 @@
-package org.argeo.util.register;
+package org.argeo.api.register;
 
 import java.util.Map;
 import java.util.Objects;
diff --git a/org.argeo.util/src/org/argeo/util/register/SimpleRegister.java b/org.argeo.api.register/src/org/argeo/api/register/SimpleRegister.java
similarity index 99%
rename from org.argeo.util/src/org/argeo/util/register/SimpleRegister.java
rename to org.argeo.api.register/src/org/argeo/api/register/SimpleRegister.java
index 7aa9ebef9..9ed7e765f 100644
--- a/org.argeo.util/src/org/argeo/util/register/SimpleRegister.java
+++ b/org.argeo.api.register/src/org/argeo/api/register/SimpleRegister.java
@@ -1,4 +1,4 @@
-package org.argeo.util.register;
+package org.argeo.api.register;
 
 import java.util.HashSet;
 import java.util.IdentityHashMap;
diff --git a/org.argeo.cms.ee/bnd.bnd b/org.argeo.cms.ee/bnd.bnd
index 08ce1365c..f09995c00 100644
--- a/org.argeo.cms.ee/bnd.bnd
+++ b/org.argeo.cms.ee/bnd.bnd
@@ -1,5 +1,4 @@
 Import-Package:\
-org.argeo.util.http,\
 org.osgi.service.http;version=0.0.0,\
 org.osgi.service.http.whiteboard;version=0.0.0,\
 org.osgi.framework.namespace;version=0.0.0,\
diff --git a/org.argeo.cms.ee/src/org/argeo/cms/integration/CmsExceptionsChain.java b/org.argeo.cms.ee/src/org/argeo/cms/integration/CmsExceptionsChain.java
index 205699464..672722946 100644
--- a/org.argeo.cms.ee/src/org/argeo/cms/integration/CmsExceptionsChain.java
+++ b/org.argeo.cms.ee/src/org/argeo/cms/integration/CmsExceptionsChain.java
@@ -6,7 +6,7 @@ import java.io.Writer;
 import javax.servlet.http.HttpServletResponse;
 
 import org.argeo.api.cms.CmsLog;
-import org.argeo.util.ExceptionsChain;
+import org.argeo.cms.util.ExceptionsChain;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonProcessingException;
diff --git a/org.argeo.cms.ee/src/org/argeo/cms/integration/CmsTokenServlet.java b/org.argeo.cms.ee/src/org/argeo/cms/integration/CmsTokenServlet.java
index 983202ad2..e170609bb 100644
--- a/org.argeo.cms.ee/src/org/argeo/cms/integration/CmsTokenServlet.java
+++ b/org.argeo.cms.ee/src/org/argeo/cms/integration/CmsTokenServlet.java
@@ -15,13 +15,13 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.argeo.api.acr.ldap.NamingUtils;
 import org.argeo.api.cms.CmsAuth;
 import org.argeo.cms.CmsUserManager;
 import org.argeo.cms.auth.RemoteAuthCallback;
 import org.argeo.cms.auth.RemoteAuthCallbackHandler;
 import org.argeo.cms.servlet.ServletHttpRequest;
 import org.argeo.cms.servlet.ServletHttpResponse;
-import org.argeo.util.naming.NamingUtils;
 import org.osgi.service.useradmin.Authorization;
 
 import com.fasterxml.jackson.core.JsonGenerator;
diff --git a/org.argeo.cms.ee/src/org/argeo/cms/servlet/CmsServletContext.java b/org.argeo.cms.ee/src/org/argeo/cms/servlet/CmsServletContext.java
index 6a5208730..d3c0eb540 100644
--- a/org.argeo.cms.ee/src/org/argeo/cms/servlet/CmsServletContext.java
+++ b/org.argeo.cms.ee/src/org/argeo/cms/servlet/CmsServletContext.java
@@ -2,11 +2,8 @@ package org.argeo.cms.servlet;
 
 import java.io.IOException;
 import java.net.URL;
-import java.net.http.HttpHeaders;
-import java.security.PrivilegedAction;
 import java.util.Map;
 
-import javax.security.auth.Subject;
 import javax.security.auth.login.LoginContext;
 import javax.security.auth.login.LoginException;
 import javax.servlet.http.HttpServletRequest;
@@ -19,7 +16,6 @@ import org.argeo.cms.auth.RemoteAuthRequest;
 import org.argeo.cms.auth.RemoteAuthResponse;
 import org.argeo.cms.auth.RemoteAuthUtils;
 import org.argeo.cms.servlet.internal.HttpUtils;
-import org.argeo.util.http.HttpHeader;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.service.http.context.ServletContextHelper;
diff --git a/org.argeo.cms.ee/src/org/argeo/cms/servlet/internal/PkgServlet.java b/org.argeo.cms.ee/src/org/argeo/cms/servlet/internal/PkgServlet.java
index dd0b70aff..2b2ffcb10 100644
--- a/org.argeo.cms.ee/src/org/argeo/cms/servlet/internal/PkgServlet.java
+++ b/org.argeo.cms.ee/src/org/argeo/cms/servlet/internal/PkgServlet.java
@@ -12,9 +12,9 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.argeo.cms.osgi.FilterRequirement;
 import org.argeo.cms.osgi.PublishNamespace;
-import org.argeo.osgi.util.FilterRequirement;
-import org.argeo.util.StreamUtils;
+import org.argeo.cms.util.StreamUtils;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
diff --git a/org.argeo.cms.ee/src/org/argeo/cms/websocket/server/TestEndpoint.java b/org.argeo.cms.ee/src/org/argeo/cms/websocket/server/TestEndpoint.java
index cc608136b..f0c7fca3a 100644
--- a/org.argeo.cms.ee/src/org/argeo/cms/websocket/server/TestEndpoint.java
+++ b/org.argeo.cms.ee/src/org/argeo/cms/websocket/server/TestEndpoint.java
@@ -16,9 +16,9 @@ import javax.websocket.Session;
 import javax.websocket.server.PathParam;
 import javax.websocket.server.ServerEndpoint;
 
+import org.argeo.api.acr.ldap.NamingUtils;
 import org.argeo.api.cms.CmsLog;
 import org.argeo.cms.integration.CmsExceptionsChain;
-import org.argeo.util.naming.NamingUtils;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.ServiceRegistration;
diff --git a/org.argeo.cms.lib.jetty/src/org/argeo/cms/jetty/JettyHttpServer.java b/org.argeo.cms.lib.jetty/src/org/argeo/cms/jetty/JettyHttpServer.java
index d393e4b2b..4141cd8cc 100644
--- a/org.argeo.cms.lib.jetty/src/org/argeo/cms/jetty/JettyHttpServer.java
+++ b/org.argeo.cms.lib.jetty/src/org/argeo/cms/jetty/JettyHttpServer.java
@@ -13,7 +13,7 @@ import javax.websocket.server.ServerContainer;
 import org.argeo.api.cms.CmsLog;
 import org.argeo.api.cms.CmsState;
 import org.argeo.cms.CmsDeployProperty;
-import org.argeo.util.http.HttpServerUtils;
+import org.argeo.cms.http.HttpServerUtils;
 import org.eclipse.jetty.http.UriCompliance;
 import org.eclipse.jetty.server.HttpConfiguration;
 import org.eclipse.jetty.server.HttpConnectionFactory;
diff --git a/org.argeo.cms.lib.sshd/src/org/argeo/cms/ssh/BasicSshServer.java b/org.argeo.cms.lib.sshd/src/org/argeo/cms/ssh/BasicSshServer.java
index be41f9cbd..cde6c935a 100644
--- a/org.argeo.cms.lib.sshd/src/org/argeo/cms/ssh/BasicSshServer.java
+++ b/org.argeo.cms.lib.sshd/src/org/argeo/cms/ssh/BasicSshServer.java
@@ -9,7 +9,7 @@ import org.apache.sshd.server.SshServer;
 import org.apache.sshd.server.config.keys.DefaultAuthorizedKeysAuthenticator;
 import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider;
 import org.apache.sshd.server.shell.ProcessShellFactory;
-import org.argeo.util.OS;
+import org.argeo.cms.util.OS;
 
 /** A simple SSH server with some defaults. Supports SCP. */
 public class BasicSshServer {
diff --git a/org.argeo.cms.lib.sshd/src/org/argeo/cms/ssh/SshSync.java b/org.argeo.cms.lib.sshd/src/org/argeo/cms/ssh/SshSync.java
index 660db5967..31e63411a 100644
--- a/org.argeo.cms.lib.sshd/src/org/argeo/cms/ssh/SshSync.java
+++ b/org.argeo.cms.lib.sshd/src/org/argeo/cms/ssh/SshSync.java
@@ -24,7 +24,7 @@ import org.apache.sshd.common.config.keys.FilePasswordProvider;
 import org.apache.sshd.sftp.client.fs.SftpFileSystem;
 import org.apache.sshd.sftp.client.fs.SftpFileSystemProvider;
 import org.argeo.api.cms.CmsLog;
-import org.argeo.util.StreamUtils;
+import org.argeo.cms.util.StreamUtils;
 
 public class SshSync {
 	private final static CmsLog log = CmsLog.getLog(SshSync.class);
diff --git a/org.argeo.cms.ux/src/org/argeo/cms/ux/CmsUxUtils.java b/org.argeo.cms.ux/src/org/argeo/cms/ux/CmsUxUtils.java
index 916cc74f2..087b4ff7c 100644
--- a/org.argeo.cms.ux/src/org/argeo/cms/ux/CmsUxUtils.java
+++ b/org.argeo.cms.ux/src/org/argeo/cms/ux/CmsUxUtils.java
@@ -5,7 +5,7 @@ import org.argeo.api.acr.ContentRepository;
 import org.argeo.api.acr.ContentSession;
 import org.argeo.api.cms.ux.Cms2DSize;
 import org.argeo.api.cms.ux.CmsView;
-import org.argeo.util.CurrentSubject;
+import org.argeo.cms.util.CurrentSubject;
 
 public class CmsUxUtils {
 	public static ContentSession getContentSession(ContentRepository contentRepository, CmsView cmsView) {
diff --git a/org.argeo.cms/OSGI-INF/cmsUserAdmin.xml b/org.argeo.cms/OSGI-INF/cmsUserAdmin.xml
index 50a9ea6eb..52c75318e 100644
--- a/org.argeo.cms/OSGI-INF/cmsUserAdmin.xml
+++ b/org.argeo.cms/OSGI-INF/cmsUserAdmin.xml
@@ -2,8 +2,8 @@
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="start" deactivate="stop" immediate="false" name="Node User Admin">
    <implementation class="org.argeo.cms.internal.runtime.CmsUserAdmin"/>
    <property name="service.pid" type="String" value="org.argeo.api.userAdmin"/>
-   <reference bind="setTransactionManager" cardinality="1..1" interface="org.argeo.util.transaction.WorkControl" name="WorkControl" policy="static"/>
-   <reference bind="setUserTransaction" cardinality="1..1" interface="org.argeo.util.transaction.WorkTransaction" name="WorkTransaction" policy="static"/>
+   <reference bind="setTransactionManager" cardinality="1..1" interface="org.argeo.api.cms.transaction.WorkControl" name="WorkControl" policy="static"/>
+   <reference bind="setUserTransaction" cardinality="1..1" interface="org.argeo.api.cms.transaction.WorkTransaction" name="WorkTransaction" policy="static"/>
  <reference bind="setCmsState" cardinality="1..1" interface="org.argeo.api.cms.CmsState" name="CmsState" policy="static"/>
  <service>
     <provide interface="org.osgi.service.useradmin.UserAdmin"/>
diff --git a/org.argeo.cms/OSGI-INF/cmsUserManager.xml b/org.argeo.cms/OSGI-INF/cmsUserManager.xml
index d22660c9f..1f0033171 100644
--- a/org.argeo.cms/OSGI-INF/cmsUserManager.xml
+++ b/org.argeo.cms/OSGI-INF/cmsUserManager.xml
@@ -5,5 +5,5 @@
       <provide interface="org.argeo.cms.CmsUserManager"/>
    </service>
    <reference bind="setUserAdmin" cardinality="1..1" interface="org.osgi.service.useradmin.UserAdmin" name="UserAdmin" policy="static"/>
-   <reference bind="setUserTransaction" cardinality="1..1" interface="org.argeo.util.transaction.WorkTransaction" name="UserTransaction" policy="static"/>
+   <reference bind="setUserTransaction" cardinality="1..1" interface="org.argeo.api.cms.transaction.WorkTransaction" name="UserTransaction" policy="static"/>
 </scr:component>
diff --git a/org.argeo.cms/OSGI-INF/transactionManager.xml b/org.argeo.cms/OSGI-INF/transactionManager.xml
index 81997476e..df317e937 100644
--- a/org.argeo.cms/OSGI-INF/transactionManager.xml
+++ b/org.argeo.cms/OSGI-INF/transactionManager.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="Simple Transaction Manager">
-   <implementation class="org.argeo.util.transaction.SimpleTransactionManager"/>
+   <implementation class="org.argeo.api.cms.transaction.SimpleTransactionManager"/>
    <service>
-      <provide interface="org.argeo.util.transaction.WorkControl"/>
-      <provide interface="org.argeo.util.transaction.WorkTransaction"/>
+      <provide interface="org.argeo.api.cms.transaction.WorkControl"/>
+      <provide interface="org.argeo.api.cms.transaction.WorkTransaction"/>
    </service>
 </scr:component>
diff --git a/org.argeo.cms/src/org/argeo/cms/security/AbstractKeyring.java b/org.argeo.cms/src/org/argeo/cms/AbstractKeyring.java
similarity index 97%
rename from org.argeo.cms/src/org/argeo/cms/security/AbstractKeyring.java
rename to org.argeo.cms/src/org/argeo/cms/AbstractKeyring.java
index 3de2e1451..c2c9c6107 100644
--- a/org.argeo.cms/src/org/argeo/cms/security/AbstractKeyring.java
+++ b/org.argeo.cms/src/org/argeo/cms/AbstractKeyring.java
@@ -1,4 +1,4 @@
-package org.argeo.cms.security;
+package org.argeo.cms;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -25,8 +25,11 @@ import javax.security.auth.login.LoginContext;
 import javax.security.auth.login.LoginException;
 
 import org.argeo.api.cms.CmsAuth;
-import org.argeo.util.CurrentSubject;
-import org.argeo.util.StreamUtils;
+import org.argeo.api.cms.keyring.PBEKeySpecCallback;
+import org.argeo.cms.util.CurrentSubject;
+import org.argeo.cms.util.StreamUtils;
+import org.argeo.api.cms.keyring.CryptoKeyring;
+import org.argeo.api.cms.keyring.Keyring;
 
 /** username / password based keyring. TODO internationalize */
 public abstract class AbstractKeyring implements Keyring, CryptoKeyring {
diff --git a/org.argeo.cms/src/org/argeo/cms/CmsUserManager.java b/org.argeo.cms/src/org/argeo/cms/CmsUserManager.java
index 728884b52..3e7d31e3e 100644
--- a/org.argeo.cms/src/org/argeo/cms/CmsUserManager.java
+++ b/org.argeo.cms/src/org/argeo/cms/CmsUserManager.java
@@ -7,9 +7,9 @@ import java.util.Set;
 
 import javax.security.auth.Subject;
 
+import org.argeo.api.cms.directory.HierarchyUnit;
 import org.argeo.cms.auth.SystemRole;
-import org.argeo.osgi.useradmin.UserDirectory;
-import org.argeo.util.directory.HierarchyUnit;
+import org.argeo.cms.osgi.useradmin.UserDirectory;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.service.useradmin.Group;
 import org.osgi.service.useradmin.Role;
diff --git a/org.argeo.cms/src/org/argeo/cms/acr/AbstractContent.java b/org.argeo.cms/src/org/argeo/cms/acr/AbstractContent.java
index ce05dc14c..16f39609e 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/AbstractContent.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/AbstractContent.java
@@ -17,7 +17,7 @@ import org.argeo.api.acr.CrName;
 import org.argeo.api.acr.NamespaceUtils;
 import org.argeo.api.acr.spi.ProvidedContent;
 import org.argeo.api.acr.spi.ProvidedSession;
-import org.argeo.util.LangUtils;
+import org.argeo.cms.util.LangUtils;
 
 /** Partial reference implementation of a {@link ProvidedContent}. */
 public abstract class AbstractContent extends AbstractMap<QName, Object> implements ProvidedContent {
diff --git a/org.argeo.cms/src/org/argeo/cms/acr/AbstractContentRepository.java b/org.argeo.cms/src/org/argeo/cms/acr/AbstractContentRepository.java
index a2d8069dd..98a2fec93 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/AbstractContentRepository.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/AbstractContentRepository.java
@@ -17,6 +17,7 @@ import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
+import org.argeo.api.acr.ArgeoNamespace;
 import org.argeo.api.acr.Content;
 import org.argeo.api.acr.CrName;
 import org.argeo.api.acr.NamespaceUtils;
@@ -117,7 +118,7 @@ public abstract class AbstractContentRepository implements ProvidedRepository {
 //				document = dBuilder.parse(inputSource);
 //			} else {
 			document = dBuilder.newDocument();
-			Element root = document.createElementNS(CrName.CR_NAMESPACE_URI,
+			Element root = document.createElementNS(ArgeoNamespace.CR_NAMESPACE_URI,
 					NamespaceUtils.toPrefixedName(CrName.root.qName()));
 
 			for (String prefix : RuntimeNamespaceContext.getPrefixes().keySet()) {
diff --git a/org.argeo.cms/src/org/argeo/cms/acr/CmsContentRepository.java b/org.argeo.cms/src/org/argeo/cms/acr/CmsContentRepository.java
index 474e07232..2b4de14da 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/CmsContentRepository.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/CmsContentRepository.java
@@ -17,7 +17,7 @@ import org.argeo.api.cms.DataAdminPrincipal;
 import org.argeo.api.uuid.UuidFactory;
 import org.argeo.cms.auth.CurrentUser;
 import org.argeo.cms.internal.runtime.CmsContextImpl;
-import org.argeo.util.CurrentSubject;
+import org.argeo.cms.util.CurrentSubject;
 
 /**
  * Multi-session {@link ProvidedRepository}, integrated with a CMS.
diff --git a/org.argeo.cms/src/org/argeo/cms/acr/CmsContentTypes.java b/org.argeo.cms/src/org/argeo/cms/acr/CmsContentTypes.java
index fff40c1bb..9caa4e657 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/CmsContentTypes.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/CmsContentTypes.java
@@ -4,13 +4,13 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Objects;
 
-import org.argeo.api.acr.CrName;
+import org.argeo.api.acr.ArgeoNamespace;
 
 public enum CmsContentTypes {
 	//
 	// ARGEO
 	//
-	CR_2(CrName.CR_DEFAULT_PREFIX, CrName.CR_NAMESPACE_URI, "cr.xsd", null),
+	CR_2(ArgeoNamespace.CR_DEFAULT_PREFIX, ArgeoNamespace.CR_NAMESPACE_URI, "cr.xsd", null),
 	//
 	SLC("slc", "http://www.argeo.org/ns/slc", null, null),
 	//
diff --git a/org.argeo.cms/src/org/argeo/cms/acr/ContentUtils.java b/org.argeo.cms/src/org/argeo/cms/acr/ContentUtils.java
index 74e93fc0a..a6acb8a34 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/ContentUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/ContentUtils.java
@@ -15,11 +15,11 @@ import org.argeo.api.acr.ContentRepository;
 import org.argeo.api.acr.ContentSession;
 import org.argeo.api.acr.DName;
 import org.argeo.api.cms.CmsAuth;
+import org.argeo.api.cms.directory.Directory;
+import org.argeo.api.cms.directory.HierarchyUnit;
 import org.argeo.cms.CmsUserManager;
-import org.argeo.osgi.useradmin.UserDirectory;
-import org.argeo.util.CurrentSubject;
-import org.argeo.util.directory.Directory;
-import org.argeo.util.directory.HierarchyUnit;
+import org.argeo.cms.osgi.useradmin.UserDirectory;
+import org.argeo.cms.util.CurrentSubject;
 import org.osgi.service.useradmin.Role;
 
 /** Utilities and routines around {@link Content}. */
diff --git a/org.argeo.cms/src/org/argeo/cms/acr/SingleUserContentRepository.java b/org.argeo.cms/src/org/argeo/cms/acr/SingleUserContentRepository.java
index 5e7c191e2..8c87c5a93 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/SingleUserContentRepository.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/SingleUserContentRepository.java
@@ -10,11 +10,11 @@ import javax.security.auth.Subject;
 import javax.security.auth.x500.X500Principal;
 
 import org.argeo.api.acr.ContentSession;
+import org.argeo.api.acr.ldap.LdapAttrs;
 import org.argeo.api.acr.spi.ProvidedRepository;
 import org.argeo.api.uuid.MacAddressUuidFactory;
 import org.argeo.api.uuid.UuidFactory;
 import org.argeo.cms.acr.fs.FsContentProvider;
-import org.argeo.util.naming.LdapAttrs;
 
 /**
  * A standalone {@link ProvidedRepository} with a single {@link Subject} (which
diff --git a/org.argeo.cms/src/org/argeo/cms/acr/dav/DavContent.java b/org.argeo.cms/src/org/argeo/cms/acr/dav/DavContent.java
index 1313704f0..96e6eeaf3 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/dav/DavContent.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/dav/DavContent.java
@@ -17,7 +17,7 @@ import org.argeo.api.acr.spi.ProvidedSession;
 import org.argeo.cms.acr.AbstractContent;
 import org.argeo.cms.acr.ContentUtils;
 import org.argeo.cms.dav.DavResponse;
-import org.argeo.util.http.HttpStatus;
+import org.argeo.cms.http.HttpStatus;
 
 public class DavContent extends AbstractContent {
 	private final DavContentProvider provider;
diff --git a/org.argeo.cms/src/org/argeo/cms/acr/dav/DavContentProvider.java b/org.argeo.cms/src/org/argeo/cms/acr/dav/DavContentProvider.java
index bc4bbfed3..374fcebbc 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/dav/DavContentProvider.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/dav/DavContentProvider.java
@@ -10,7 +10,7 @@ import org.argeo.api.acr.spi.ProvidedContent;
 import org.argeo.api.acr.spi.ProvidedSession;
 import org.argeo.cms.dav.DavClient;
 import org.argeo.cms.dav.DavResponse;
-import org.argeo.util.http.HttpStatus;
+import org.argeo.cms.http.HttpStatus;
 
 public class DavContentProvider implements ContentProvider {
 	private String mountPath;
diff --git a/org.argeo.cms/src/org/argeo/cms/acr/directory/AbstractDirectoryContent.java b/org.argeo.cms/src/org/argeo/cms/acr/directory/AbstractDirectoryContent.java
index 2d337c0dd..ac0a7317f 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/directory/AbstractDirectoryContent.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/directory/AbstractDirectoryContent.java
@@ -10,15 +10,15 @@ import java.util.TreeSet;
 
 import javax.xml.namespace.QName;
 
+import org.argeo.api.acr.ArgeoNamespace;
 import org.argeo.api.acr.ContentName;
 import org.argeo.api.acr.CrAttributeType;
-import org.argeo.api.acr.CrName;
 import org.argeo.api.acr.NamespaceUtils;
+import org.argeo.api.acr.ldap.LdapAttrs;
+import org.argeo.api.acr.ldap.LdapObjs;
 import org.argeo.api.acr.spi.ContentProvider;
 import org.argeo.api.acr.spi.ProvidedSession;
 import org.argeo.cms.acr.AbstractContent;
-import org.argeo.util.naming.LdapAttrs;
-import org.argeo.util.naming.LdapObjs;
 
 abstract class AbstractDirectoryContent extends AbstractContent {
 	protected final DirectoryContentProvider provider;
@@ -54,7 +54,7 @@ abstract class AbstractDirectoryContent extends AbstractContent {
 				continue keys;
 			if (key.equalsIgnoreCase(LdapAttrs.objectClasses.name()))
 				continue keys;
-			ContentName name = new ContentName(CrName.LDAP_NAMESPACE_URI, key, provider);
+			ContentName name = new ContentName(ArgeoNamespace.LDAP_NAMESPACE_URI, key, provider);
 			keys.add(name);
 		}
 		return keys;
@@ -65,7 +65,7 @@ abstract class AbstractDirectoryContent extends AbstractContent {
 		Dictionary<String, Object> properties = doGetProperties();
 		List<QName> contentClasses = new ArrayList<>();
 		String objectClass = properties.get(LdapAttrs.objectClass.name()).toString();
-		contentClasses.add(new ContentName(CrName.LDAP_NAMESPACE_URI, objectClass, provider));
+		contentClasses.add(new ContentName(ArgeoNamespace.LDAP_NAMESPACE_URI, objectClass, provider));
 
 		String[] objectClasses = properties.get(LdapAttrs.objectClasses.name()).toString().split("\\n");
 		objectClasses: for (String oc : objectClasses) {
@@ -73,7 +73,7 @@ abstract class AbstractDirectoryContent extends AbstractContent {
 				continue objectClasses;
 			if (objectClass.equalsIgnoreCase(oc))
 				continue objectClasses;
-			contentClasses.add(new ContentName(CrName.LDAP_NAMESPACE_URI, oc, provider));
+			contentClasses.add(new ContentName(ArgeoNamespace.LDAP_NAMESPACE_URI, oc, provider));
 		}
 		return contentClasses;
 	}
diff --git a/org.argeo.cms/src/org/argeo/cms/acr/directory/DirectoryContent.java b/org.argeo.cms/src/org/argeo/cms/acr/directory/DirectoryContent.java
index 4e738ae2b..992f0b41b 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/directory/DirectoryContent.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/directory/DirectoryContent.java
@@ -10,8 +10,8 @@ import javax.xml.namespace.QName;
 import org.argeo.api.acr.Content;
 import org.argeo.api.acr.ContentName;
 import org.argeo.api.acr.spi.ProvidedSession;
-import org.argeo.util.directory.Directory;
-import org.argeo.util.directory.HierarchyUnit;
+import org.argeo.api.cms.directory.Directory;
+import org.argeo.api.cms.directory.HierarchyUnit;
 
 class DirectoryContent extends AbstractDirectoryContent {
 	private Directory directory;
diff --git a/org.argeo.cms/src/org/argeo/cms/acr/directory/DirectoryContentProvider.java b/org.argeo.cms/src/org/argeo/cms/acr/directory/DirectoryContentProvider.java
index aab5d6dc0..08171435c 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/directory/DirectoryContentProvider.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/directory/DirectoryContentProvider.java
@@ -7,18 +7,18 @@ import java.util.List;
 
 import javax.xml.namespace.QName;
 
+import org.argeo.api.acr.ArgeoNamespace;
 import org.argeo.api.acr.Content;
 import org.argeo.api.acr.ContentName;
 import org.argeo.api.acr.ContentNotFoundException;
-import org.argeo.api.acr.CrName;
 import org.argeo.api.acr.spi.ContentProvider;
 import org.argeo.api.acr.spi.ProvidedContent;
 import org.argeo.api.acr.spi.ProvidedSession;
+import org.argeo.api.cms.directory.HierarchyUnit;
 import org.argeo.cms.CmsUserManager;
 import org.argeo.cms.acr.AbstractContent;
 import org.argeo.cms.acr.ContentUtils;
-import org.argeo.osgi.useradmin.UserDirectory;
-import org.argeo.util.directory.HierarchyUnit;
+import org.argeo.cms.osgi.useradmin.UserDirectory;
 import org.osgi.service.useradmin.User;
 
 public class DirectoryContentProvider implements ContentProvider {
@@ -92,16 +92,16 @@ public class DirectoryContentProvider implements ContentProvider {
 
 	@Override
 	public String getNamespaceURI(String prefix) {
-		if (CrName.LDAP_DEFAULT_PREFIX.equals(prefix))
-			return CrName.LDAP_NAMESPACE_URI;
-		throw new IllegalArgumentException("Only prefix " + CrName.LDAP_DEFAULT_PREFIX + " is supported");
+		if (ArgeoNamespace.LDAP_DEFAULT_PREFIX.equals(prefix))
+			return ArgeoNamespace.LDAP_NAMESPACE_URI;
+		throw new IllegalArgumentException("Only prefix " + ArgeoNamespace.LDAP_DEFAULT_PREFIX + " is supported");
 	}
 
 	@Override
 	public Iterator<String> getPrefixes(String namespaceURI) {
-		if (CrName.LDAP_NAMESPACE_URI.equals(namespaceURI))
-			return Collections.singletonList(CrName.LDAP_DEFAULT_PREFIX).iterator();
-		throw new IllegalArgumentException("Only namespace URI " + CrName.LDAP_NAMESPACE_URI + " is supported");
+		if (ArgeoNamespace.LDAP_NAMESPACE_URI.equals(namespaceURI))
+			return Collections.singletonList(ArgeoNamespace.LDAP_DEFAULT_PREFIX).iterator();
+		throw new IllegalArgumentException("Only namespace URI " + ArgeoNamespace.LDAP_NAMESPACE_URI + " is supported");
 	}
 
 	public void setUserManager(CmsUserManager userManager) {
diff --git a/org.argeo.cms/src/org/argeo/cms/acr/directory/HierarchyUnitContent.java b/org.argeo.cms/src/org/argeo/cms/acr/directory/HierarchyUnitContent.java
index 1e4aad773..feae4b517 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/directory/HierarchyUnitContent.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/directory/HierarchyUnitContent.java
@@ -13,9 +13,9 @@ import org.argeo.api.acr.ContentName;
 import org.argeo.api.acr.CrName;
 import org.argeo.api.acr.DName;
 import org.argeo.api.acr.spi.ProvidedSession;
-import org.argeo.osgi.useradmin.UserDirectory;
-import org.argeo.util.directory.Directory;
-import org.argeo.util.directory.HierarchyUnit;
+import org.argeo.api.cms.directory.Directory;
+import org.argeo.api.cms.directory.HierarchyUnit;
+import org.argeo.cms.osgi.useradmin.UserDirectory;
 import org.osgi.service.useradmin.Role;
 
 class HierarchyUnitContent extends AbstractDirectoryContent {
diff --git a/org.argeo.cms/src/org/argeo/cms/acr/directory/RoleContent.java b/org.argeo.cms/src/org/argeo/cms/acr/directory/RoleContent.java
index 7aa144633..3b1ae46b2 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/directory/RoleContent.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/directory/RoleContent.java
@@ -7,7 +7,7 @@ import javax.xml.namespace.QName;
 import org.argeo.api.acr.Content;
 import org.argeo.api.acr.ContentName;
 import org.argeo.api.acr.spi.ProvidedSession;
-import org.argeo.osgi.useradmin.UserDirectory;
+import org.argeo.cms.osgi.useradmin.UserDirectory;
 import org.osgi.service.useradmin.Group;
 import org.osgi.service.useradmin.Role;
 import org.osgi.service.useradmin.User;
diff --git a/org.argeo.cms/src/org/argeo/cms/acr/fs/FsContent.java b/org.argeo.cms/src/org/argeo/cms/acr/fs/FsContent.java
index 2d30cedec..43cae8572 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/fs/FsContent.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/fs/FsContent.java
@@ -44,7 +44,7 @@ import org.argeo.api.acr.spi.ProvidedSession;
 import org.argeo.api.cms.CmsLog;
 import org.argeo.cms.acr.AbstractContent;
 import org.argeo.cms.acr.ContentUtils;
-import org.argeo.util.FsUtils;
+import org.argeo.cms.util.FsUtils;
 
 /** Content persisted as a filesystem {@link Path}. */
 public class FsContent extends AbstractContent implements ProvidedContent {
diff --git a/org.argeo.cms/src/org/argeo/cms/acr/fs/FsContentProvider.java b/org.argeo.cms/src/org/argeo/cms/acr/fs/FsContentProvider.java
index 59a4d8deb..9b1b96683 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/fs/FsContentProvider.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/fs/FsContentProvider.java
@@ -13,8 +13,8 @@ import java.util.Objects;
 import java.util.TreeMap;
 import java.util.stream.Collectors;
 
+import org.argeo.api.acr.ArgeoNamespace;
 import org.argeo.api.acr.ContentResourceException;
-import org.argeo.api.acr.CrName;
 import org.argeo.api.acr.NamespaceUtils;
 import org.argeo.api.acr.RuntimeNamespaceContext;
 import org.argeo.api.acr.spi.ContentProvider;
@@ -62,10 +62,10 @@ public class FsContentProvider implements ContentProvider {
 			}
 
 			// defaults
-			addDefaultNamespace(udfav, CrName.CR_DEFAULT_PREFIX, CrName.CR_NAMESPACE_URI);
-			addDefaultNamespace(udfav, "basic", CrName.CR_NAMESPACE_URI);
-			addDefaultNamespace(udfav, "owner", CrName.CR_NAMESPACE_URI);
-			addDefaultNamespace(udfav, "posix", CrName.CR_NAMESPACE_URI);
+			addDefaultNamespace(udfav, ArgeoNamespace.CR_DEFAULT_PREFIX, ArgeoNamespace.CR_NAMESPACE_URI);
+			addDefaultNamespace(udfav, "basic", ArgeoNamespace.CR_NAMESPACE_URI);
+			addDefaultNamespace(udfav, "owner", ArgeoNamespace.CR_NAMESPACE_URI);
+			addDefaultNamespace(udfav, "posix", ArgeoNamespace.CR_NAMESPACE_URI);
 		} catch (IOException e) {
 			throw new RuntimeException("Cannot read namespaces from " + rootPath, e);
 		}
diff --git a/org.argeo.cms/src/org/argeo/cms/acr/xml/ElementIterator.java b/org.argeo.cms/src/org/argeo/cms/acr/xml/ElementIterator.java
index ea1a17d7e..3f7476221 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/xml/ElementIterator.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/xml/ElementIterator.java
@@ -3,6 +3,7 @@ package org.argeo.cms.acr.xml;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
+import org.argeo.api.acr.ArgeoNamespace;
 import org.argeo.api.acr.Content;
 import org.argeo.api.acr.CrName;
 import org.argeo.api.acr.spi.ProvidedSession;
@@ -52,7 +53,7 @@ class ElementIterator implements Iterator<Content> {
 		if (nextElement == null)
 			throw new NoSuchElementException();
 		Content result;
-		String isMount = nextElement.getAttributeNS(CrName.CR_NAMESPACE_URI, CrName.mount.qName().getLocalPart());
+		String isMount = nextElement.getAttributeNS(ArgeoNamespace.CR_NAMESPACE_URI, CrName.mount.qName().getLocalPart());
 		if (isMount.equals("true")) {
 			result = session.get(parent.getPath() + '/' + nextElement.getTagName());
 		}
diff --git a/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java b/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java
index d7d6c282c..289f8dcc6 100644
--- a/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/CmsAuthUtils.java
@@ -27,7 +27,7 @@ import org.argeo.cms.internal.auth.CmsSessionImpl;
 import org.argeo.cms.internal.auth.ImpliedByPrincipal;
 import org.argeo.cms.internal.auth.RemoteCmsSessionImpl;
 import org.argeo.cms.internal.runtime.CmsContextImpl;
-import org.argeo.osgi.useradmin.AuthenticatingUser;
+import org.argeo.cms.osgi.useradmin.AuthenticatingUser;
 import org.osgi.service.useradmin.Authorization;
 
 /** Centralises security related registrations. */
diff --git a/org.argeo.cms/src/org/argeo/cms/auth/CmsRole.java b/org.argeo.cms/src/org/argeo/cms/auth/CmsRole.java
index 6aa1c1c25..5ac23ea6a 100644
--- a/org.argeo.cms/src/org/argeo/cms/auth/CmsRole.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/CmsRole.java
@@ -2,8 +2,8 @@ package org.argeo.cms.auth;
 
 import javax.xml.namespace.QName;
 
+import org.argeo.api.acr.ArgeoNamespace;
 import org.argeo.api.acr.ContentName;
-import org.argeo.api.acr.CrName;
 
 /** Standard CMS system roles. */
 public enum CmsRole implements SystemRole {
@@ -15,7 +15,7 @@ public enum CmsRole implements SystemRole {
 	private final ContentName name;
 
 	CmsRole() {
-		name = new ContentName(CrName.ROLE_NAMESPACE_URI, QUALIFIER + name());
+		name = new ContentName(ArgeoNamespace.ROLE_NAMESPACE_URI, QUALIFIER + name());
 	}
 
 	@Override
diff --git a/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java b/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java
index 2fd8730d8..ee522a580 100644
--- a/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/CurrentUser.java
@@ -20,7 +20,7 @@ import org.argeo.api.cms.CmsSessionId;
 import org.argeo.cms.internal.auth.CmsSessionImpl;
 import org.argeo.cms.internal.auth.ImpliedByPrincipal;
 import org.argeo.cms.internal.runtime.CmsContextImpl;
-import org.argeo.util.CurrentSubject;
+import org.argeo.cms.util.CurrentSubject;
 import org.osgi.service.useradmin.Authorization;
 
 /**
diff --git a/org.argeo.cms/src/org/argeo/cms/auth/KeyringLoginModule.java b/org.argeo.cms/src/org/argeo/cms/auth/KeyringLoginModule.java
index af559df75..ebab12f2c 100644
--- a/org.argeo.cms/src/org/argeo/cms/auth/KeyringLoginModule.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/KeyringLoginModule.java
@@ -14,9 +14,9 @@ import javax.security.auth.callback.PasswordCallback;
 import javax.security.auth.login.LoginException;
 import javax.security.auth.spi.LoginModule;
 
-import org.argeo.cms.security.PBEKeySpecCallback;
-import org.argeo.util.CurrentSubject;
-import org.argeo.util.PasswordEncryption;
+import org.argeo.api.cms.keyring.PBEKeySpecCallback;
+import org.argeo.cms.util.CurrentSubject;
+import org.argeo.cms.util.PasswordEncryption;
 
 /** Adds a secret key to the private credentials */
 public class KeyringLoginModule implements LoginModule {
diff --git a/org.argeo.cms/src/org/argeo/cms/auth/RemoteAuthUtils.java b/org.argeo.cms/src/org/argeo/cms/auth/RemoteAuthUtils.java
index 785eeb912..4a8f18fcd 100644
--- a/org.argeo.cms/src/org/argeo/cms/auth/RemoteAuthUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/RemoteAuthUtils.java
@@ -12,10 +12,10 @@ import javax.security.auth.login.LoginException;
 import org.argeo.api.cms.CmsAuth;
 import org.argeo.api.cms.CmsLog;
 import org.argeo.api.cms.CmsSession;
+import org.argeo.cms.http.HttpHeader;
+import org.argeo.cms.http.HttpStatus;
 import org.argeo.cms.internal.runtime.CmsContextImpl;
-import org.argeo.util.CurrentSubject;
-import org.argeo.util.http.HttpHeader;
-import org.argeo.util.http.HttpStatus;
+import org.argeo.cms.util.CurrentSubject;
 import org.ietf.jgss.GSSContext;
 import org.ietf.jgss.GSSException;
 import org.ietf.jgss.GSSManager;
diff --git a/org.argeo.cms/src/org/argeo/cms/auth/RemoteSessionLoginModule.java b/org.argeo.cms/src/org/argeo/cms/auth/RemoteSessionLoginModule.java
index 772531ede..987c3dd19 100644
--- a/org.argeo.cms/src/org/argeo/cms/auth/RemoteSessionLoginModule.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/RemoteSessionLoginModule.java
@@ -16,10 +16,10 @@ import javax.security.auth.spi.LoginModule;
 
 import org.argeo.api.cms.CmsLog;
 import org.argeo.cms.CmsDeployProperty;
+import org.argeo.cms.http.HttpHeader;
 import org.argeo.cms.internal.auth.CmsSessionImpl;
 import org.argeo.cms.internal.runtime.CmsContextImpl;
 import org.argeo.cms.internal.runtime.CmsStateImpl;
-import org.argeo.util.http.HttpHeader;
 import org.osgi.service.useradmin.Authorization;
 
 /** Use a remote session as the basis for authentication. */
diff --git a/org.argeo.cms/src/org/argeo/cms/auth/SingleUserLoginModule.java b/org.argeo.cms/src/org/argeo/cms/auth/SingleUserLoginModule.java
index 35b7d5cc7..23fdb6dee 100644
--- a/org.argeo.cms/src/org/argeo/cms/auth/SingleUserLoginModule.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/SingleUserLoginModule.java
@@ -11,10 +11,10 @@ import javax.security.auth.login.LoginException;
 import javax.security.auth.spi.LoginModule;
 import javax.security.auth.x500.X500Principal;
 
+import org.argeo.api.acr.ldap.LdapAttrs;
+import org.argeo.cms.directory.ldap.IpaUtils;
 import org.argeo.cms.internal.runtime.CmsContextImpl;
-import org.argeo.osgi.useradmin.OsUserUtils;
-import org.argeo.util.directory.ldap.IpaUtils;
-import org.argeo.util.naming.LdapAttrs;
+import org.argeo.cms.osgi.useradmin.OsUserUtils;
 import org.osgi.service.useradmin.Authorization;
 
 /** Login module for when the system is owned by a single user. */
diff --git a/org.argeo.cms/src/org/argeo/cms/auth/UserAdminLoginModule.java b/org.argeo.cms/src/org/argeo/cms/auth/UserAdminLoginModule.java
index 0ae84ff8a..278321c24 100644
--- a/org.argeo.cms/src/org/argeo/cms/auth/UserAdminLoginModule.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/UserAdminLoginModule.java
@@ -1,6 +1,6 @@
 package org.argeo.cms.auth;
 
-import static org.argeo.util.naming.LdapAttrs.cn;
+import static org.argeo.api.acr.ldap.LdapAttrs.cn;
 
 import java.io.IOException;
 import java.security.PrivilegedAction;
@@ -24,13 +24,13 @@ import javax.security.auth.login.CredentialNotFoundException;
 import javax.security.auth.login.LoginException;
 import javax.security.auth.spi.LoginModule;
 
+import org.argeo.api.acr.ldap.LdapAttrs;
 import org.argeo.api.cms.CmsConstants;
 import org.argeo.api.cms.CmsLog;
+import org.argeo.cms.directory.ldap.IpaUtils;
 import org.argeo.cms.internal.runtime.CmsContextImpl;
-import org.argeo.osgi.useradmin.AuthenticatingUser;
-import org.argeo.osgi.useradmin.TokenUtils;
-import org.argeo.util.directory.ldap.IpaUtils;
-import org.argeo.util.naming.LdapAttrs;
+import org.argeo.cms.osgi.useradmin.AuthenticatingUser;
+import org.argeo.cms.osgi.useradmin.TokenUtils;
 import org.osgi.service.useradmin.Authorization;
 import org.osgi.service.useradmin.Group;
 import org.osgi.service.useradmin.User;
diff --git a/org.argeo.cms/src/org/argeo/cms/auth/UserAdminUtils.java b/org.argeo.cms/src/org/argeo/cms/auth/UserAdminUtils.java
index e3eb44249..47d2eeb41 100644
--- a/org.argeo.cms/src/org/argeo/cms/auth/UserAdminUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/UserAdminUtils.java
@@ -6,8 +6,8 @@ import javax.naming.InvalidNameException;
 import javax.naming.ldap.LdapName;
 import javax.naming.ldap.Rdn;
 
+import org.argeo.api.acr.ldap.LdapAttrs;
 import org.argeo.api.cms.CmsConstants;
-import org.argeo.util.naming.LdapAttrs;
 import org.osgi.service.useradmin.Role;
 import org.osgi.service.useradmin.User;
 import org.osgi.service.useradmin.UserAdmin;
diff --git a/org.argeo.cms/src/org/argeo/cms/client/CmsClient.java b/org.argeo.cms/src/org/argeo/cms/client/CmsClient.java
index af0656097..8cfae3a1b 100644
--- a/org.argeo.cms/src/org/argeo/cms/client/CmsClient.java
+++ b/org.argeo.cms/src/org/argeo/cms/client/CmsClient.java
@@ -30,7 +30,7 @@ import javax.security.auth.login.LoginException;
 
 import org.argeo.cms.auth.ConsoleCallbackHandler;
 import org.argeo.cms.auth.RemoteAuthUtils;
-import org.argeo.util.http.HttpHeader;
+import org.argeo.cms.http.HttpHeader;
 
 /** Utility to connect to a remote CMS node. */
 public class CmsClient {
diff --git a/org.argeo.cms/src/org/argeo/cms/dav/DavClient.java b/org.argeo.cms/src/org/argeo/cms/dav/DavClient.java
index 94f292c8e..6fe2eb617 100644
--- a/org.argeo.cms/src/org/argeo/cms/dav/DavClient.java
+++ b/org.argeo.cms/src/org/argeo/cms/dav/DavClient.java
@@ -15,9 +15,9 @@ import java.util.Iterator;
 
 import javax.xml.namespace.QName;
 
-import org.argeo.util.http.HttpHeader;
-import org.argeo.util.http.HttpMethod;
-import org.argeo.util.http.HttpStatus;
+import org.argeo.cms.http.HttpHeader;
+import org.argeo.cms.http.HttpMethod;
+import org.argeo.cms.http.HttpStatus;
 
 public class DavClient {
 
diff --git a/org.argeo.cms/src/org/argeo/cms/dav/DavDepth.java b/org.argeo.cms/src/org/argeo/cms/dav/DavDepth.java
index 24695e7b1..c7542b55a 100644
--- a/org.argeo.cms/src/org/argeo/cms/dav/DavDepth.java
+++ b/org.argeo.cms/src/org/argeo/cms/dav/DavDepth.java
@@ -1,6 +1,6 @@
 package org.argeo.cms.dav;
 
-import org.argeo.util.http.HttpHeader;
+import org.argeo.cms.http.HttpHeader;
 
 import com.sun.net.httpserver.HttpExchange;
 
diff --git a/org.argeo.cms/src/org/argeo/cms/dav/DavHttpHandler.java b/org.argeo.cms/src/org/argeo/cms/dav/DavHttpHandler.java
index 1d6c02623..9fd03f25a 100644
--- a/org.argeo.cms/src/org/argeo/cms/dav/DavHttpHandler.java
+++ b/org.argeo.cms/src/org/argeo/cms/dav/DavHttpHandler.java
@@ -10,10 +10,10 @@ import java.util.function.Consumer;
 import javax.xml.namespace.NamespaceContext;
 
 import org.argeo.api.acr.ContentNotFoundException;
-import org.argeo.util.http.HttpHeader;
-import org.argeo.util.http.HttpMethod;
-import org.argeo.util.http.HttpStatus;
-import org.argeo.util.http.HttpServerUtils;
+import org.argeo.cms.http.HttpHeader;
+import org.argeo.cms.http.HttpMethod;
+import org.argeo.cms.http.HttpServerUtils;
+import org.argeo.cms.http.HttpStatus;
 
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
diff --git a/org.argeo.cms/src/org/argeo/cms/dav/DavResponse.java b/org.argeo.cms/src/org/argeo/cms/dav/DavResponse.java
index 828dc2640..8dd6bf3fc 100644
--- a/org.argeo.cms/src/org/argeo/cms/dav/DavResponse.java
+++ b/org.argeo.cms/src/org/argeo/cms/dav/DavResponse.java
@@ -10,7 +10,7 @@ import java.util.TreeSet;
 
 import javax.xml.namespace.QName;
 
-import org.argeo.util.http.HttpStatus;
+import org.argeo.cms.http.HttpStatus;
 
 /** The WebDav response for a given resource. */
 public class DavResponse {
diff --git a/org.argeo.cms/src/org/argeo/cms/dav/MultiStatusReader.java b/org.argeo.cms/src/org/argeo/cms/dav/MultiStatusReader.java
index 6d22c8e29..c7b54b027 100644
--- a/org.argeo.cms/src/org/argeo/cms/dav/MultiStatusReader.java
+++ b/org.argeo.cms/src/org/argeo/cms/dav/MultiStatusReader.java
@@ -19,7 +19,7 @@ import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
-import org.argeo.util.http.HttpStatus;
+import org.argeo.cms.http.HttpStatus;
 
 /**
  * Asynchronously iterate over the response statuses of the response to a
diff --git a/org.argeo.cms/src/org/argeo/cms/dav/MultiStatusWriter.java b/org.argeo.cms/src/org/argeo/cms/dav/MultiStatusWriter.java
index 986b2fe92..4689b8c8d 100644
--- a/org.argeo.cms/src/org/argeo/cms/dav/MultiStatusWriter.java
+++ b/org.argeo.cms/src/org/argeo/cms/dav/MultiStatusWriter.java
@@ -20,7 +20,7 @@ import javax.xml.stream.XMLOutputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
 
-import org.argeo.util.http.HttpStatus;
+import org.argeo.cms.http.HttpStatus;
 
 class MultiStatusWriter implements Consumer<DavResponse> {
 	private BlockingQueue<DavResponse> queue = new ArrayBlockingQueue<>(64);
diff --git a/org.argeo.util/src/org/argeo/util/directory/ldap/AbstractLdapDirectory.java b/org.argeo.cms/src/org/argeo/cms/directory/ldap/AbstractLdapDirectory.java
similarity index 96%
rename from org.argeo.util/src/org/argeo/util/directory/ldap/AbstractLdapDirectory.java
rename to org.argeo.cms/src/org/argeo/cms/directory/ldap/AbstractLdapDirectory.java
index 5cd4ac1a5..06c33b011 100644
--- a/org.argeo.util/src/org/argeo/util/directory/ldap/AbstractLdapDirectory.java
+++ b/org.argeo.cms/src/org/argeo/cms/directory/ldap/AbstractLdapDirectory.java
@@ -1,6 +1,6 @@
-package org.argeo.util.directory.ldap;
+package org.argeo.cms.directory.ldap;
 
-import static org.argeo.util.directory.ldap.LdapNameUtils.toLdapName;
+import static org.argeo.cms.directory.ldap.LdapNameUtils.toLdapName;
 
 import java.io.File;
 import java.net.URI;
@@ -26,15 +26,15 @@ import javax.naming.ldap.LdapName;
 import javax.naming.ldap.Rdn;
 import javax.transaction.xa.XAResource;
 
-import org.argeo.osgi.useradmin.OsUserDirectory;
-import org.argeo.util.directory.Directory;
-import org.argeo.util.directory.DirectoryConf;
-import org.argeo.util.directory.HierarchyUnit;
-import org.argeo.util.naming.LdapAttrs;
-import org.argeo.util.naming.LdapObjs;
-import org.argeo.util.transaction.WorkControl;
-import org.argeo.util.transaction.WorkingCopyXaResource;
-import org.argeo.util.transaction.XAResourceProvider;
+import org.argeo.api.acr.ldap.LdapAttrs;
+import org.argeo.api.acr.ldap.LdapObjs;
+import org.argeo.api.cms.directory.Directory;
+import org.argeo.api.cms.directory.HierarchyUnit;
+import org.argeo.api.cms.transaction.WorkControl;
+import org.argeo.api.cms.transaction.WorkingCopyXaResource;
+import org.argeo.api.cms.transaction.XAResourceProvider;
+import org.argeo.cms.osgi.useradmin.OsUserDirectory;
+import org.argeo.cms.runtime.DirectoryConf;
 
 /** A {@link Directory} based either on LDAP or LDIF. */
 public abstract class AbstractLdapDirectory implements Directory, XAResourceProvider {
diff --git a/org.argeo.util/src/org/argeo/util/directory/ldap/AbstractLdapDirectoryDao.java b/org.argeo.cms/src/org/argeo/cms/directory/ldap/AbstractLdapDirectoryDao.java
similarity index 94%
rename from org.argeo.util/src/org/argeo/util/directory/ldap/AbstractLdapDirectoryDao.java
rename to org.argeo.cms/src/org/argeo/cms/directory/ldap/AbstractLdapDirectoryDao.java
index e6d242fe8..c4a691032 100644
--- a/org.argeo.util/src/org/argeo/util/directory/ldap/AbstractLdapDirectoryDao.java
+++ b/org.argeo.cms/src/org/argeo/cms/directory/ldap/AbstractLdapDirectoryDao.java
@@ -1,4 +1,4 @@
-package org.argeo.util.directory.ldap;
+package org.argeo.cms.directory.ldap;
 
 import javax.naming.ldap.LdapName;
 
diff --git a/org.argeo.util/src/org/argeo/util/directory/ldap/AttributesDictionary.java b/org.argeo.cms/src/org/argeo/cms/directory/ldap/AttributesDictionary.java
similarity index 99%
rename from org.argeo.util/src/org/argeo/util/directory/ldap/AttributesDictionary.java
rename to org.argeo.cms/src/org/argeo/cms/directory/ldap/AttributesDictionary.java
index 7b0095fbe..9deda1be4 100644
--- a/org.argeo.util/src/org/argeo/util/directory/ldap/AttributesDictionary.java
+++ b/org.argeo.cms/src/org/argeo/cms/directory/ldap/AttributesDictionary.java
@@ -1,4 +1,4 @@
-package org.argeo.util.directory.ldap;
+package org.argeo.cms.directory.ldap;
 
 import java.util.Dictionary;
 import java.util.Enumeration;
diff --git a/org.argeo.util/src/org/argeo/util/directory/ldap/AuthPassword.java b/org.argeo.cms/src/org/argeo/cms/directory/ldap/AuthPassword.java
similarity index 98%
rename from org.argeo.util/src/org/argeo/util/directory/ldap/AuthPassword.java
rename to org.argeo.cms/src/org/argeo/cms/directory/ldap/AuthPassword.java
index e10f45756..f2332dbcf 100644
--- a/org.argeo.util/src/org/argeo/util/directory/ldap/AuthPassword.java
+++ b/org.argeo.cms/src/org/argeo/cms/directory/ldap/AuthPassword.java
@@ -1,4 +1,4 @@
-package org.argeo.util.directory.ldap;
+package org.argeo.cms.directory.ldap;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -14,7 +14,7 @@ import javax.security.auth.callback.NameCallback;
 import javax.security.auth.callback.PasswordCallback;
 import javax.security.auth.callback.UnsupportedCallbackException;
 
-import org.argeo.util.naming.LdapAttrs;
+import org.argeo.api.acr.ldap.LdapAttrs;
 
 /** LDAP authPassword field according to RFC 3112 */
 public class AuthPassword implements CallbackHandler {
diff --git a/org.argeo.util/src/org/argeo/util/directory/ldap/DefaultLdapEntry.java b/org.argeo.cms/src/org/argeo/cms/directory/ldap/DefaultLdapEntry.java
similarity index 98%
rename from org.argeo.util/src/org/argeo/util/directory/ldap/DefaultLdapEntry.java
rename to org.argeo.cms/src/org/argeo/cms/directory/ldap/DefaultLdapEntry.java
index c01d1c3c1..ad70d676e 100644
--- a/org.argeo.util/src/org/argeo/util/directory/ldap/DefaultLdapEntry.java
+++ b/org.argeo.cms/src/org/argeo/cms/directory/ldap/DefaultLdapEntry.java
@@ -1,4 +1,4 @@
-package org.argeo.util.directory.ldap;
+package org.argeo.cms.directory.ldap;
 
 import static java.nio.charset.StandardCharsets.US_ASCII;
 
@@ -22,9 +22,9 @@ import javax.naming.directory.Attributes;
 import javax.naming.directory.BasicAttribute;
 import javax.naming.ldap.LdapName;
 
-import org.argeo.util.directory.DirectoryDigestUtils;
-import org.argeo.util.naming.LdapAttrs;
-import org.argeo.util.naming.LdapObjs;
+import org.argeo.api.acr.ldap.LdapAttrs;
+import org.argeo.api.acr.ldap.LdapObjs;
+import org.argeo.api.cms.directory.DirectoryDigestUtils;
 
 /** An entry in an LDAP (or LDIF) directory. */
 public class DefaultLdapEntry implements LdapEntry {
diff --git a/org.argeo.util/src/org/argeo/util/directory/ldap/IpaUtils.java b/org.argeo.cms/src/org/argeo/cms/directory/ldap/IpaUtils.java
similarity index 96%
rename from org.argeo.util/src/org/argeo/util/directory/ldap/IpaUtils.java
rename to org.argeo.cms/src/org/argeo/cms/directory/ldap/IpaUtils.java
index 99ad6dbe8..a31cdaca1 100644
--- a/org.argeo.util/src/org/argeo/util/directory/ldap/IpaUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/directory/ldap/IpaUtils.java
@@ -1,4 +1,4 @@
-package org.argeo.util.directory.ldap;
+package org.argeo.cms.directory.ldap;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -13,9 +13,9 @@ import java.util.StringJoiner;
 import javax.naming.InvalidNameException;
 import javax.naming.ldap.LdapName;
 
-import org.argeo.util.directory.DirectoryConf;
-import org.argeo.util.naming.LdapAttrs;
-import org.argeo.util.naming.dns.DnsBrowser;
+import org.argeo.api.acr.ldap.LdapAttrs;
+import org.argeo.cms.dns.DnsBrowser;
+import org.argeo.cms.runtime.DirectoryConf;
 
 /** Free IPA specific conventions. */
 public class IpaUtils {
diff --git a/org.argeo.util/src/org/argeo/util/directory/ldap/LdapConnection.java b/org.argeo.cms/src/org/argeo/cms/directory/ldap/LdapConnection.java
similarity index 97%
rename from org.argeo.util/src/org/argeo/util/directory/ldap/LdapConnection.java
rename to org.argeo.cms/src/org/argeo/cms/directory/ldap/LdapConnection.java
index 748efe350..100441cc1 100644
--- a/org.argeo.util/src/org/argeo/util/directory/ldap/LdapConnection.java
+++ b/org.argeo.cms/src/org/argeo/cms/directory/ldap/LdapConnection.java
@@ -1,4 +1,4 @@
-package org.argeo.util.directory.ldap;
+package org.argeo.cms.directory.ldap;
 
 import java.util.Dictionary;
 import java.util.Hashtable;
@@ -15,8 +15,8 @@ import javax.naming.directory.SearchResult;
 import javax.naming.ldap.InitialLdapContext;
 import javax.naming.ldap.LdapName;
 
-import org.argeo.util.naming.LdapAttrs;
-import org.argeo.util.transaction.WorkingCopy;
+import org.argeo.api.acr.ldap.LdapAttrs;
+import org.argeo.api.cms.transaction.WorkingCopy;
 
 /** A synchronized wrapper for a single {@link InitialLdapContext}. */
 // TODO implement multiple contexts and connection pooling.
diff --git a/org.argeo.util/src/org/argeo/util/directory/ldap/LdapDao.java b/org.argeo.cms/src/org/argeo/cms/directory/ldap/LdapDao.java
similarity index 97%
rename from org.argeo.util/src/org/argeo/util/directory/ldap/LdapDao.java
rename to org.argeo.cms/src/org/argeo/cms/directory/ldap/LdapDao.java
index 9157f23a4..461013fea 100644
--- a/org.argeo.util/src/org/argeo/util/directory/ldap/LdapDao.java
+++ b/org.argeo.cms/src/org/argeo/cms/directory/ldap/LdapDao.java
@@ -1,6 +1,6 @@
-package org.argeo.util.directory.ldap;
+package org.argeo.cms.directory.ldap;
 
-import static org.argeo.util.naming.LdapAttrs.objectClass;
+import static org.argeo.api.acr.ldap.LdapAttrs.objectClass;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -19,9 +19,9 @@ import javax.naming.directory.SearchResult;
 import javax.naming.ldap.LdapName;
 import javax.naming.ldap.Rdn;
 
-import org.argeo.util.directory.HierarchyUnit;
-import org.argeo.util.naming.LdapAttrs;
-import org.argeo.util.naming.LdapObjs;
+import org.argeo.api.acr.ldap.LdapAttrs;
+import org.argeo.api.acr.ldap.LdapObjs;
+import org.argeo.api.cms.directory.HierarchyUnit;
 
 /** A user admin based on a LDAP server. */
 public class LdapDao extends AbstractLdapDirectoryDao {
diff --git a/org.argeo.util/src/org/argeo/util/directory/ldap/LdapDirectoryDao.java b/org.argeo.cms/src/org/argeo/cms/directory/ldap/LdapDirectoryDao.java
similarity index 85%
rename from org.argeo.util/src/org/argeo/util/directory/ldap/LdapDirectoryDao.java
rename to org.argeo.cms/src/org/argeo/cms/directory/ldap/LdapDirectoryDao.java
index c70d8c54f..03b03ea11 100644
--- a/org.argeo.util/src/org/argeo/util/directory/ldap/LdapDirectoryDao.java
+++ b/org.argeo.cms/src/org/argeo/cms/directory/ldap/LdapDirectoryDao.java
@@ -1,4 +1,4 @@
-package org.argeo.util.directory.ldap;
+package org.argeo.cms.directory.ldap;
 
 import java.util.List;
 
@@ -6,8 +6,8 @@ import javax.naming.NameNotFoundException;
 import javax.naming.directory.Attributes;
 import javax.naming.ldap.LdapName;
 
-import org.argeo.util.directory.HierarchyUnit;
-import org.argeo.util.transaction.WorkingCopyProcessor;
+import org.argeo.api.cms.directory.HierarchyUnit;
+import org.argeo.api.cms.transaction.WorkingCopyProcessor;
 
 /** Low-level access to an LDAP/LDIF directory. */
 public interface LdapDirectoryDao extends WorkingCopyProcessor<LdapEntryWorkingCopy> {
diff --git a/org.argeo.util/src/org/argeo/util/directory/ldap/LdapEntry.java b/org.argeo.cms/src/org/argeo/cms/directory/ldap/LdapEntry.java
similarity index 95%
rename from org.argeo.util/src/org/argeo/util/directory/ldap/LdapEntry.java
rename to org.argeo.cms/src/org/argeo/cms/directory/ldap/LdapEntry.java
index 4657c8798..e2587621a 100644
--- a/org.argeo.util/src/org/argeo/util/directory/ldap/LdapEntry.java
+++ b/org.argeo.cms/src/org/argeo/cms/directory/ldap/LdapEntry.java
@@ -1,4 +1,4 @@
-package org.argeo.util.directory.ldap;
+package org.argeo.cms.directory.ldap;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -12,7 +12,7 @@ import java.util.TreeSet;
 import javax.naming.directory.Attributes;
 import javax.naming.ldap.LdapName;
 
-import org.argeo.util.naming.LdapAttrs;
+import org.argeo.api.acr.ldap.LdapAttrs;
 
 /** An LDAP entry. */
 public interface LdapEntry {
diff --git a/org.argeo.util/src/org/argeo/util/directory/ldap/LdapEntryWorkingCopy.java b/org.argeo.cms/src/org/argeo/cms/directory/ldap/LdapEntryWorkingCopy.java
similarity index 82%
rename from org.argeo.util/src/org/argeo/util/directory/ldap/LdapEntryWorkingCopy.java
rename to org.argeo.cms/src/org/argeo/cms/directory/ldap/LdapEntryWorkingCopy.java
index 381c11b2f..b5afc9dce 100644
--- a/org.argeo.util/src/org/argeo/util/directory/ldap/LdapEntryWorkingCopy.java
+++ b/org.argeo.cms/src/org/argeo/cms/directory/ldap/LdapEntryWorkingCopy.java
@@ -1,9 +1,9 @@
-package org.argeo.util.directory.ldap;
+package org.argeo.cms.directory.ldap;
 
 import javax.naming.directory.Attributes;
 import javax.naming.ldap.LdapName;
 
-import org.argeo.util.transaction.AbstractWorkingCopy;
+import org.argeo.api.cms.transaction.AbstractWorkingCopy;
 
 /** Working copy for a user directory being edited. */
 public class LdapEntryWorkingCopy extends AbstractWorkingCopy<LdapEntry, Attributes, LdapName> {
diff --git a/org.argeo.util/src/org/argeo/util/directory/ldap/LdapHierarchyUnit.java b/org.argeo.cms/src/org/argeo/cms/directory/ldap/LdapHierarchyUnit.java
similarity index 94%
rename from org.argeo.util/src/org/argeo/util/directory/ldap/LdapHierarchyUnit.java
rename to org.argeo.cms/src/org/argeo/cms/directory/ldap/LdapHierarchyUnit.java
index 961f2e358..7abf09885 100644
--- a/org.argeo.util/src/org/argeo/util/directory/ldap/LdapHierarchyUnit.java
+++ b/org.argeo.cms/src/org/argeo/cms/directory/ldap/LdapHierarchyUnit.java
@@ -1,11 +1,11 @@
-package org.argeo.util.directory.ldap;
+package org.argeo.cms.directory.ldap;
 
 import java.util.Locale;
 
 import javax.naming.ldap.LdapName;
 import javax.naming.ldap.Rdn;
 
-import org.argeo.util.directory.HierarchyUnit;
+import org.argeo.api.cms.directory.HierarchyUnit;
 
 /** LDIF/LDAP based implementation of {@link HierarchyUnit}. */
 public class LdapHierarchyUnit extends DefaultLdapEntry implements HierarchyUnit {
diff --git a/org.argeo.util/src/org/argeo/util/directory/ldap/LdapNameUtils.java b/org.argeo.cms/src/org/argeo/cms/directory/ldap/LdapNameUtils.java
similarity index 97%
rename from org.argeo.util/src/org/argeo/util/directory/ldap/LdapNameUtils.java
rename to org.argeo.cms/src/org/argeo/cms/directory/ldap/LdapNameUtils.java
index 88d317542..74f23da67 100644
--- a/org.argeo.util/src/org/argeo/util/directory/ldap/LdapNameUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/directory/ldap/LdapNameUtils.java
@@ -1,4 +1,4 @@
-package org.argeo.util.directory.ldap;
+package org.argeo.cms.directory.ldap;
 
 import javax.naming.InvalidNameException;
 import javax.naming.ldap.LdapName;
diff --git a/org.argeo.util/src/org/argeo/util/directory/ldap/LdifDao.java b/org.argeo.cms/src/org/argeo/cms/directory/ldap/LdifDao.java
similarity index 97%
rename from org.argeo.util/src/org/argeo/util/directory/ldap/LdifDao.java
rename to org.argeo.cms/src/org/argeo/cms/directory/ldap/LdifDao.java
index c200faa27..1f3389896 100644
--- a/org.argeo.util/src/org/argeo/util/directory/ldap/LdifDao.java
+++ b/org.argeo.cms/src/org/argeo/cms/directory/ldap/LdifDao.java
@@ -1,7 +1,7 @@
-package org.argeo.util.directory.ldap;
+package org.argeo.cms.directory.ldap;
 
-import static org.argeo.util.naming.LdapAttrs.objectClass;
-import static org.argeo.util.naming.LdapObjs.inetOrgPerson;
+import static org.argeo.api.acr.ldap.LdapAttrs.objectClass;
+import static org.argeo.api.acr.ldap.LdapObjs.inetOrgPerson;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -26,8 +26,8 @@ import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
 import javax.naming.ldap.LdapName;
 
-import org.argeo.util.directory.HierarchyUnit;
-import org.argeo.util.naming.LdapObjs;
+import org.argeo.api.acr.ldap.LdapObjs;
+import org.argeo.api.cms.directory.HierarchyUnit;
 import org.osgi.framework.Filter;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.InvalidSyntaxException;
diff --git a/org.argeo.util/src/org/argeo/util/directory/ldap/LdifParser.java b/org.argeo.cms/src/org/argeo/cms/directory/ldap/LdifParser.java
similarity index 98%
rename from org.argeo.util/src/org/argeo/util/directory/ldap/LdifParser.java
rename to org.argeo.cms/src/org/argeo/cms/directory/ldap/LdifParser.java
index 0022943e1..c76c362cb 100644
--- a/org.argeo.util/src/org/argeo/util/directory/ldap/LdifParser.java
+++ b/org.argeo.cms/src/org/argeo/cms/directory/ldap/LdifParser.java
@@ -1,4 +1,4 @@
-package org.argeo.util.directory.ldap;
+package org.argeo.cms.directory.ldap;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -22,7 +22,7 @@ import javax.naming.directory.BasicAttributes;
 import javax.naming.ldap.LdapName;
 import javax.naming.ldap.Rdn;
 
-import org.argeo.util.naming.LdapAttrs;
+import org.argeo.api.acr.ldap.LdapAttrs;
 
 /** Basic LDIF parser. */
 public class LdifParser {
diff --git a/org.argeo.util/src/org/argeo/util/directory/ldap/LdifWriter.java b/org.argeo.cms/src/org/argeo/cms/directory/ldap/LdifWriter.java
similarity index 93%
rename from org.argeo.util/src/org/argeo/util/directory/ldap/LdifWriter.java
rename to org.argeo.cms/src/org/argeo/cms/directory/ldap/LdifWriter.java
index a10f16938..2a1ed811f 100644
--- a/org.argeo.util/src/org/argeo/util/directory/ldap/LdifWriter.java
+++ b/org.argeo.cms/src/org/argeo/cms/directory/ldap/LdifWriter.java
@@ -1,9 +1,9 @@
-package org.argeo.util.directory.ldap;
+package org.argeo.cms.directory.ldap;
 
-import static org.argeo.util.naming.LdapAttrs.DN;
-import static org.argeo.util.naming.LdapAttrs.member;
-import static org.argeo.util.naming.LdapAttrs.objectClass;
-import static org.argeo.util.naming.LdapAttrs.uniqueMember;
+import static org.argeo.api.acr.ldap.LdapAttrs.DN;
+import static org.argeo.api.acr.ldap.LdapAttrs.member;
+import static org.argeo.api.acr.ldap.LdapAttrs.objectClass;
+import static org.argeo.api.acr.ldap.LdapAttrs.uniqueMember;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/org.argeo.util/src/org/argeo/util/directory/ldap/SharedSecret.java b/org.argeo.cms/src/org/argeo/cms/directory/ldap/SharedSecret.java
similarity index 93%
rename from org.argeo.util/src/org/argeo/util/directory/ldap/SharedSecret.java
rename to org.argeo.cms/src/org/argeo/cms/directory/ldap/SharedSecret.java
index eaab167e8..2c52ee12a 100644
--- a/org.argeo.util/src/org/argeo/util/directory/ldap/SharedSecret.java
+++ b/org.argeo.cms/src/org/argeo/cms/directory/ldap/SharedSecret.java
@@ -1,10 +1,10 @@
-package org.argeo.util.directory.ldap;
+package org.argeo.cms.directory.ldap;
 
 import java.time.Instant;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 
-import org.argeo.util.naming.NamingUtils;
+import org.argeo.api.acr.ldap.NamingUtils;
 
 public class SharedSecret extends AuthPassword {
 	public final static String X_SHARED_SECRET = "X-SharedSecret";
diff --git a/org.argeo.util/src/org/argeo/util/naming/dns/DnsBrowser.java b/org.argeo.cms/src/org/argeo/cms/dns/DnsBrowser.java
similarity index 99%
rename from org.argeo.util/src/org/argeo/util/naming/dns/DnsBrowser.java
rename to org.argeo.cms/src/org/argeo/cms/dns/DnsBrowser.java
index 4fba43405..c6b653015 100644
--- a/org.argeo.util/src/org/argeo/util/naming/dns/DnsBrowser.java
+++ b/org.argeo.cms/src/org/argeo/cms/dns/DnsBrowser.java
@@ -1,4 +1,4 @@
-package org.argeo.util.naming.dns;
+package org.argeo.cms.dns;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/org.argeo.util/src/org/argeo/util/naming/dns/SrvRecord.java b/org.argeo.cms/src/org/argeo/cms/dns/SrvRecord.java
similarity index 97%
rename from org.argeo.util/src/org/argeo/util/naming/dns/SrvRecord.java
rename to org.argeo.cms/src/org/argeo/cms/dns/SrvRecord.java
index ea6f3cc96..bdbdc769a 100644
--- a/org.argeo.util/src/org/argeo/util/naming/dns/SrvRecord.java
+++ b/org.argeo.cms/src/org/argeo/cms/dns/SrvRecord.java
@@ -1,4 +1,4 @@
-package org.argeo.util.naming.dns;
+package org.argeo.cms.dns;
 
 class SrvRecord implements Comparable<SrvRecord> {
 	private final Integer priority;
diff --git a/org.argeo.cms/src/org/argeo/cms/security/ChecksumFactory.java b/org.argeo.cms/src/org/argeo/cms/file/ChecksumFactory.java
similarity index 99%
rename from org.argeo.cms/src/org/argeo/cms/security/ChecksumFactory.java
rename to org.argeo.cms/src/org/argeo/cms/file/ChecksumFactory.java
index 7344f01bc..6aea8bea0 100644
--- a/org.argeo.cms/src/org/argeo/cms/security/ChecksumFactory.java
+++ b/org.argeo.cms/src/org/argeo/cms/file/ChecksumFactory.java
@@ -1,4 +1,4 @@
-package org.argeo.cms.security;
+package org.argeo.cms.file;
 
 import java.io.IOException;
 import java.math.BigInteger;
diff --git a/org.argeo.util/src/org/argeo/util/http/HttpHeader.java b/org.argeo.cms/src/org/argeo/cms/http/HttpHeader.java
similarity index 95%
rename from org.argeo.util/src/org/argeo/util/http/HttpHeader.java
rename to org.argeo.cms/src/org/argeo/cms/http/HttpHeader.java
index 74cf94c03..217b7a48a 100644
--- a/org.argeo.util/src/org/argeo/util/http/HttpHeader.java
+++ b/org.argeo.cms/src/org/argeo/cms/http/HttpHeader.java
@@ -1,4 +1,4 @@
-package org.argeo.util.http;
+package org.argeo.cms.http;
 
 /** Standard HTTP headers (including WebDav). */
 public enum HttpHeader {
diff --git a/org.argeo.util/src/org/argeo/util/http/HttpMethod.java b/org.argeo.cms/src/org/argeo/cms/http/HttpMethod.java
similarity index 87%
rename from org.argeo.util/src/org/argeo/util/http/HttpMethod.java
rename to org.argeo.cms/src/org/argeo/cms/http/HttpMethod.java
index 27b4d8f19..786904564 100644
--- a/org.argeo.util/src/org/argeo/util/http/HttpMethod.java
+++ b/org.argeo.cms/src/org/argeo/cms/http/HttpMethod.java
@@ -1,4 +1,4 @@
-package org.argeo.util.http;
+package org.argeo.cms.http;
 
 /** Generic HTTP methods. */
 public enum HttpMethod {
diff --git a/org.argeo.util/src/org/argeo/util/http/HttpServerUtils.java b/org.argeo.cms/src/org/argeo/cms/http/HttpServerUtils.java
similarity index 98%
rename from org.argeo.util/src/org/argeo/util/http/HttpServerUtils.java
rename to org.argeo.cms/src/org/argeo/cms/http/HttpServerUtils.java
index 9127d2c21..fc04fbfaa 100644
--- a/org.argeo.util/src/org/argeo/util/http/HttpServerUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/http/HttpServerUtils.java
@@ -1,4 +1,4 @@
-package org.argeo.util.http;
+package org.argeo.cms.http;
 
 import java.net.URI;
 import java.util.Objects;
diff --git a/org.argeo.util/src/org/argeo/util/http/HttpStatus.java b/org.argeo.cms/src/org/argeo/cms/http/HttpStatus.java
similarity index 98%
rename from org.argeo.util/src/org/argeo/util/http/HttpStatus.java
rename to org.argeo.cms/src/org/argeo/cms/http/HttpStatus.java
index 11e0a3645..3b9a47a38 100644
--- a/org.argeo.util/src/org/argeo/util/http/HttpStatus.java
+++ b/org.argeo.cms/src/org/argeo/cms/http/HttpStatus.java
@@ -1,4 +1,4 @@
-package org.argeo.util.http;
+package org.argeo.cms.http;
 
 /**
  * Standard HTTP response status codes (including WebDav ones).
diff --git a/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsUserManagerImpl.java b/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsUserManagerImpl.java
index b7445633b..a4c482663 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsUserManagerImpl.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsUserManagerImpl.java
@@ -1,8 +1,8 @@
 package org.argeo.cms.internal.auth;
 
-import static org.argeo.util.naming.LdapAttrs.cn;
-import static org.argeo.util.naming.LdapAttrs.description;
-import static org.argeo.util.naming.LdapAttrs.owner;
+import static org.argeo.api.acr.ldap.LdapAttrs.cn;
+import static org.argeo.api.acr.ldap.LdapAttrs.description;
+import static org.argeo.api.acr.ldap.LdapAttrs.owner;
 
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
@@ -25,22 +25,22 @@ import javax.naming.ldap.LdapName;
 import javax.security.auth.Subject;
 
 import org.argeo.api.acr.NamespaceUtils;
+import org.argeo.api.acr.ldap.LdapAttrs;
+import org.argeo.api.acr.ldap.NamingUtils;
 import org.argeo.api.cms.CmsConstants;
 import org.argeo.api.cms.CmsLog;
+import org.argeo.api.cms.directory.HierarchyUnit;
+import org.argeo.api.cms.transaction.WorkTransaction;
 import org.argeo.cms.CmsUserManager;
 import org.argeo.cms.auth.CurrentUser;
 import org.argeo.cms.auth.SystemRole;
 import org.argeo.cms.auth.UserAdminUtils;
-import org.argeo.osgi.useradmin.AggregatingUserAdmin;
-import org.argeo.osgi.useradmin.TokenUtils;
-import org.argeo.osgi.useradmin.UserDirectory;
-import org.argeo.util.directory.DirectoryConf;
-import org.argeo.util.directory.HierarchyUnit;
-import org.argeo.util.directory.ldap.LdapEntry;
-import org.argeo.util.directory.ldap.SharedSecret;
-import org.argeo.util.naming.LdapAttrs;
-import org.argeo.util.naming.NamingUtils;
-import org.argeo.util.transaction.WorkTransaction;
+import org.argeo.cms.directory.ldap.LdapEntry;
+import org.argeo.cms.directory.ldap.SharedSecret;
+import org.argeo.cms.osgi.useradmin.AggregatingUserAdmin;
+import org.argeo.cms.osgi.useradmin.TokenUtils;
+import org.argeo.cms.osgi.useradmin.UserDirectory;
+import org.argeo.cms.runtime.DirectoryConf;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.service.useradmin.Authorization;
 import org.osgi.service.useradmin.Group;
diff --git a/org.argeo.cms/src/org/argeo/cms/internal/auth/ImpliedByPrincipal.java b/org.argeo.cms/src/org/argeo/cms/internal/auth/ImpliedByPrincipal.java
index 73f474637..7472908cd 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/auth/ImpliedByPrincipal.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/auth/ImpliedByPrincipal.java
@@ -8,7 +8,7 @@ import java.util.Set;
 
 import javax.xml.namespace.QName;
 
-import org.argeo.api.acr.CrName;
+import org.argeo.api.acr.ArgeoNamespace;
 import org.argeo.api.acr.NamespaceUtils;
 import org.argeo.cms.auth.RoleNameUtils;
 import org.osgi.service.useradmin.Authorization;
@@ -35,7 +35,7 @@ public final class ImpliedByPrincipal implements Principal {
 		this.name = name;
 		String cn = RoleNameUtils.getLastRdnValue(name);
 		roleName = NamespaceUtils.parsePrefixedName(getNamespaceContext(), cn);
-		if (roleName.getNamespaceURI().equals(CrName.ROLE_NAMESPACE_URI)) {
+		if (roleName.getNamespaceURI().equals(ArgeoNamespace.ROLE_NAMESPACE_URI)) {
 			systemRole = true;
 		}
 		context = RoleNameUtils.getContext(name);
diff --git a/org.argeo.cms/src/org/argeo/cms/internal/osgi/CmsOsgiLogger.java b/org.argeo.cms/src/org/argeo/cms/internal/osgi/CmsOsgiLogger.java
index 3358ed825..85f045bae 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/osgi/CmsOsgiLogger.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/osgi/CmsOsgiLogger.java
@@ -5,7 +5,7 @@ import java.util.Enumeration;
 
 import org.argeo.api.cms.CmsConstants;
 import org.argeo.api.cms.CmsLog;
-import org.argeo.util.directory.DirectoryConf;
+import org.argeo.cms.runtime.DirectoryConf;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceReference;
diff --git a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsAcrHttpHandler.java b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsAcrHttpHandler.java
index c36f410e2..c80933a55 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsAcrHttpHandler.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsAcrHttpHandler.java
@@ -25,9 +25,9 @@ import org.argeo.cms.dav.DavDepth;
 import org.argeo.cms.dav.DavHttpHandler;
 import org.argeo.cms.dav.DavPropfind;
 import org.argeo.cms.dav.DavResponse;
+import org.argeo.cms.http.HttpStatus;
 import org.argeo.cms.internal.http.RemoteAuthHttpExchange;
-import org.argeo.util.StreamUtils;
-import org.argeo.util.http.HttpStatus;
+import org.argeo.cms.util.StreamUtils;
 
 import com.sun.net.httpserver.HttpExchange;
 
diff --git a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsStateImpl.java b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsStateImpl.java
index 6921de77a..5c3838a0a 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsStateImpl.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsStateImpl.java
@@ -38,7 +38,7 @@ import org.argeo.api.cms.CmsState;
 import org.argeo.api.uuid.UuidFactory;
 import org.argeo.cms.CmsDeployProperty;
 import org.argeo.cms.auth.ident.IdentClient;
-import org.argeo.util.FsUtils;
+import org.argeo.cms.util.FsUtils;
 
 /**
  * Implementation of a {@link CmsState}, initialising the required services.
diff --git a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsUserAdmin.java b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsUserAdmin.java
index 7f4314b99..6aa490a69 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsUserAdmin.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/runtime/CmsUserAdmin.java
@@ -29,14 +29,14 @@ import org.argeo.api.cms.CmsAuth;
 import org.argeo.api.cms.CmsConstants;
 import org.argeo.api.cms.CmsLog;
 import org.argeo.api.cms.CmsState;
+import org.argeo.api.cms.transaction.WorkControl;
+import org.argeo.api.cms.transaction.WorkTransaction;
 import org.argeo.cms.CmsDeployProperty;
-import org.argeo.osgi.useradmin.AggregatingUserAdmin;
-import org.argeo.osgi.useradmin.DirectoryUserAdmin;
-import org.argeo.osgi.useradmin.UserDirectory;
-import org.argeo.util.directory.DirectoryConf;
-import org.argeo.util.naming.dns.DnsBrowser;
-import org.argeo.util.transaction.WorkControl;
-import org.argeo.util.transaction.WorkTransaction;
+import org.argeo.cms.dns.DnsBrowser;
+import org.argeo.cms.osgi.useradmin.AggregatingUserAdmin;
+import org.argeo.cms.osgi.useradmin.DirectoryUserAdmin;
+import org.argeo.cms.osgi.useradmin.UserDirectory;
+import org.argeo.cms.runtime.DirectoryConf;
 import org.ietf.jgss.GSSCredential;
 import org.ietf.jgss.GSSException;
 import org.ietf.jgss.GSSManager;
diff --git a/org.argeo.cms/src/org/argeo/cms/osgi/BundleCmsTheme.java b/org.argeo.cms/src/org/argeo/cms/osgi/BundleCmsTheme.java
index 3443d73a6..f60d3352e 100644
--- a/org.argeo.cms/src/org/argeo/cms/osgi/BundleCmsTheme.java
+++ b/org.argeo.cms/src/org/argeo/cms/osgi/BundleCmsTheme.java
@@ -17,7 +17,7 @@ import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 import org.argeo.api.cms.ux.CmsTheme;
-import org.argeo.util.StreamUtils;
+import org.argeo.cms.util.StreamUtils;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 
diff --git a/org.argeo.util/src/org/argeo/osgi/util/FilterRequirement.java b/org.argeo.cms/src/org/argeo/cms/osgi/FilterRequirement.java
similarity index 96%
rename from org.argeo.util/src/org/argeo/osgi/util/FilterRequirement.java
rename to org.argeo.cms/src/org/argeo/cms/osgi/FilterRequirement.java
index 31f1d4de6..5582c3481 100644
--- a/org.argeo.util/src/org/argeo/osgi/util/FilterRequirement.java
+++ b/org.argeo.cms/src/org/argeo/cms/osgi/FilterRequirement.java
@@ -1,4 +1,4 @@
-package org.argeo.osgi.util;
+package org.argeo.cms.osgi;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/org.argeo.util/src/org/argeo/osgi/useradmin/AggregatingAuthorization.java b/org.argeo.cms/src/org/argeo/cms/osgi/useradmin/AggregatingAuthorization.java
similarity index 97%
rename from org.argeo.util/src/org/argeo/osgi/useradmin/AggregatingAuthorization.java
rename to org.argeo.cms/src/org/argeo/cms/osgi/useradmin/AggregatingAuthorization.java
index 05ba94889..50131758d 100644
--- a/org.argeo.util/src/org/argeo/osgi/useradmin/AggregatingAuthorization.java
+++ b/org.argeo.cms/src/org/argeo/cms/osgi/useradmin/AggregatingAuthorization.java
@@ -1,4 +1,4 @@
-package org.argeo.osgi.useradmin;
+package org.argeo.cms.osgi.useradmin;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/org.argeo.util/src/org/argeo/osgi/useradmin/AggregatingUserAdmin.java b/org.argeo.cms/src/org/argeo/cms/osgi/useradmin/AggregatingUserAdmin.java
similarity index 98%
rename from org.argeo.util/src/org/argeo/osgi/useradmin/AggregatingUserAdmin.java
rename to org.argeo.cms/src/org/argeo/cms/osgi/useradmin/AggregatingUserAdmin.java
index c9479d51c..2d438cbf0 100644
--- a/org.argeo.util/src/org/argeo/osgi/useradmin/AggregatingUserAdmin.java
+++ b/org.argeo.cms/src/org/argeo/cms/osgi/useradmin/AggregatingUserAdmin.java
@@ -1,6 +1,6 @@
-package org.argeo.osgi.useradmin;
+package org.argeo.cms.osgi.useradmin;
 
-import static org.argeo.osgi.useradmin.DirectoryUserAdmin.toLdapName;
+import static org.argeo.cms.osgi.useradmin.DirectoryUserAdmin.toLdapName;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -16,7 +16,7 @@ import java.util.TreeSet;
 import javax.naming.InvalidNameException;
 import javax.naming.ldap.LdapName;
 
-import org.argeo.util.directory.DirectoryConf;
+import org.argeo.cms.runtime.DirectoryConf;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.service.useradmin.Authorization;
 import org.osgi.service.useradmin.Group;
diff --git a/org.argeo.util/src/org/argeo/osgi/useradmin/AuthenticatingUser.java b/org.argeo.cms/src/org/argeo/cms/osgi/useradmin/AuthenticatingUser.java
similarity index 95%
rename from org.argeo.util/src/org/argeo/osgi/useradmin/AuthenticatingUser.java
rename to org.argeo.cms/src/org/argeo/cms/osgi/useradmin/AuthenticatingUser.java
index ba1f3f753..b87dc9bf4 100644
--- a/org.argeo.util/src/org/argeo/osgi/useradmin/AuthenticatingUser.java
+++ b/org.argeo.cms/src/org/argeo/cms/osgi/useradmin/AuthenticatingUser.java
@@ -1,11 +1,11 @@
-package org.argeo.osgi.useradmin;
+package org.argeo.cms.osgi.useradmin;
 
 import java.util.Dictionary;
 import java.util.Hashtable;
 
 import javax.naming.ldap.LdapName;
 
-import org.argeo.util.directory.DirectoryDigestUtils;
+import org.argeo.api.cms.directory.DirectoryDigestUtils;
 import org.osgi.service.useradmin.User;
 
 /**
diff --git a/org.argeo.util/src/org/argeo/osgi/useradmin/DirectoryGroup.java b/org.argeo.cms/src/org/argeo/cms/osgi/useradmin/DirectoryGroup.java
similarity index 81%
rename from org.argeo.util/src/org/argeo/osgi/useradmin/DirectoryGroup.java
rename to org.argeo.cms/src/org/argeo/cms/osgi/useradmin/DirectoryGroup.java
index 1d58a2dae..d372c0507 100644
--- a/org.argeo.util/src/org/argeo/osgi/useradmin/DirectoryGroup.java
+++ b/org.argeo.cms/src/org/argeo/cms/osgi/useradmin/DirectoryGroup.java
@@ -1,4 +1,4 @@
-package org.argeo.osgi.useradmin;
+package org.argeo.cms.osgi.useradmin;
 
 import org.osgi.service.useradmin.Group;
 
diff --git a/org.argeo.util/src/org/argeo/osgi/useradmin/DirectoryUser.java b/org.argeo.cms/src/org/argeo/cms/osgi/useradmin/DirectoryUser.java
similarity index 75%
rename from org.argeo.util/src/org/argeo/osgi/useradmin/DirectoryUser.java
rename to org.argeo.cms/src/org/argeo/cms/osgi/useradmin/DirectoryUser.java
index 18b28a288..8fe0af654 100644
--- a/org.argeo.util/src/org/argeo/osgi/useradmin/DirectoryUser.java
+++ b/org.argeo.cms/src/org/argeo/cms/osgi/useradmin/DirectoryUser.java
@@ -1,4 +1,4 @@
-package org.argeo.osgi.useradmin;
+package org.argeo.cms.osgi.useradmin;
 
 import org.osgi.service.useradmin.User;
 
diff --git a/org.argeo.util/src/org/argeo/osgi/useradmin/DirectoryUserAdmin.java b/org.argeo.cms/src/org/argeo/cms/osgi/useradmin/DirectoryUserAdmin.java
similarity index 93%
rename from org.argeo.util/src/org/argeo/osgi/useradmin/DirectoryUserAdmin.java
rename to org.argeo.cms/src/org/argeo/cms/osgi/useradmin/DirectoryUserAdmin.java
index fbcff484c..59fb05dc3 100644
--- a/org.argeo.util/src/org/argeo/osgi/useradmin/DirectoryUserAdmin.java
+++ b/org.argeo.cms/src/org/argeo/cms/osgi/useradmin/DirectoryUserAdmin.java
@@ -1,11 +1,11 @@
-package org.argeo.osgi.useradmin;
+package org.argeo.cms.osgi.useradmin;
 
-import static org.argeo.util.naming.LdapAttrs.objectClass;
-import static org.argeo.util.naming.LdapObjs.extensibleObject;
-import static org.argeo.util.naming.LdapObjs.inetOrgPerson;
-import static org.argeo.util.naming.LdapObjs.organizationalPerson;
-import static org.argeo.util.naming.LdapObjs.person;
-import static org.argeo.util.naming.LdapObjs.top;
+import static org.argeo.api.acr.ldap.LdapAttrs.objectClass;
+import static org.argeo.api.acr.ldap.LdapObjs.extensibleObject;
+import static org.argeo.api.acr.ldap.LdapObjs.inetOrgPerson;
+import static org.argeo.api.acr.ldap.LdapObjs.organizationalPerson;
+import static org.argeo.api.acr.ldap.LdapObjs.person;
+import static org.argeo.api.acr.ldap.LdapObjs.top;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -25,16 +25,16 @@ import javax.naming.ldap.Rdn;
 import javax.security.auth.Subject;
 import javax.security.auth.kerberos.KerberosTicket;
 
-import org.argeo.util.CurrentSubject;
-import org.argeo.util.directory.DirectoryConf;
-import org.argeo.util.directory.DirectoryDigestUtils;
-import org.argeo.util.directory.HierarchyUnit;
-import org.argeo.util.directory.ldap.AbstractLdapDirectory;
-import org.argeo.util.directory.ldap.LdapDao;
-import org.argeo.util.directory.ldap.LdapEntry;
-import org.argeo.util.directory.ldap.LdapEntryWorkingCopy;
-import org.argeo.util.directory.ldap.LdapNameUtils;
-import org.argeo.util.directory.ldap.LdifDao;
+import org.argeo.api.cms.directory.DirectoryDigestUtils;
+import org.argeo.api.cms.directory.HierarchyUnit;
+import org.argeo.cms.directory.ldap.AbstractLdapDirectory;
+import org.argeo.cms.directory.ldap.LdapDao;
+import org.argeo.cms.directory.ldap.LdapEntry;
+import org.argeo.cms.directory.ldap.LdapEntryWorkingCopy;
+import org.argeo.cms.directory.ldap.LdapNameUtils;
+import org.argeo.cms.directory.ldap.LdifDao;
+import org.argeo.cms.runtime.DirectoryConf;
+import org.argeo.cms.util.CurrentSubject;
 import org.osgi.framework.Filter;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.InvalidSyntaxException;
diff --git a/org.argeo.util/src/org/argeo/osgi/useradmin/LdifAuthorization.java b/org.argeo.cms/src/org/argeo/cms/osgi/useradmin/LdifAuthorization.java
similarity index 96%
rename from org.argeo.util/src/org/argeo/osgi/useradmin/LdifAuthorization.java
rename to org.argeo.cms/src/org/argeo/cms/osgi/useradmin/LdifAuthorization.java
index d7f6ad960..3bedeab05 100644
--- a/org.argeo.util/src/org/argeo/osgi/useradmin/LdifAuthorization.java
+++ b/org.argeo.cms/src/org/argeo/cms/osgi/useradmin/LdifAuthorization.java
@@ -1,11 +1,11 @@
-package org.argeo.osgi.useradmin;
+package org.argeo.cms.osgi.useradmin;
 
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Dictionary;
 import java.util.List;
 
-import org.argeo.util.naming.LdapAttrs;
+import org.argeo.api.acr.ldap.LdapAttrs;
 import org.osgi.service.useradmin.Authorization;
 import org.osgi.service.useradmin.Role;
 import org.osgi.service.useradmin.User;
diff --git a/org.argeo.util/src/org/argeo/osgi/useradmin/LdifGroup.java b/org.argeo.cms/src/org/argeo/cms/osgi/useradmin/LdifGroup.java
similarity index 97%
rename from org.argeo.util/src/org/argeo/osgi/useradmin/LdifGroup.java
rename to org.argeo.cms/src/org/argeo/cms/osgi/useradmin/LdifGroup.java
index bdf34aa91..882f34a17 100644
--- a/org.argeo.util/src/org/argeo/osgi/useradmin/LdifGroup.java
+++ b/org.argeo.cms/src/org/argeo/cms/osgi/useradmin/LdifGroup.java
@@ -1,4 +1,4 @@
-package org.argeo.osgi.useradmin;
+package org.argeo.cms.osgi.useradmin;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -7,7 +7,7 @@ import javax.naming.InvalidNameException;
 import javax.naming.directory.Attribute;
 import javax.naming.ldap.LdapName;
 
-import org.argeo.util.directory.ldap.AbstractLdapDirectory;
+import org.argeo.cms.directory.ldap.AbstractLdapDirectory;
 import org.osgi.service.useradmin.Role;
 
 /** Directory group implementation */
diff --git a/org.argeo.util/src/org/argeo/osgi/useradmin/LdifUser.java b/org.argeo.cms/src/org/argeo/cms/osgi/useradmin/LdifUser.java
similarity index 70%
rename from org.argeo.util/src/org/argeo/osgi/useradmin/LdifUser.java
rename to org.argeo.cms/src/org/argeo/cms/osgi/useradmin/LdifUser.java
index 0b07c7565..2341ec430 100644
--- a/org.argeo.util/src/org/argeo/osgi/useradmin/LdifUser.java
+++ b/org.argeo.cms/src/org/argeo/cms/osgi/useradmin/LdifUser.java
@@ -1,9 +1,9 @@
-package org.argeo.osgi.useradmin;
+package org.argeo.cms.osgi.useradmin;
 
 import javax.naming.ldap.LdapName;
 
-import org.argeo.util.directory.ldap.AbstractLdapDirectory;
-import org.argeo.util.directory.ldap.DefaultLdapEntry;
+import org.argeo.cms.directory.ldap.AbstractLdapDirectory;
+import org.argeo.cms.directory.ldap.DefaultLdapEntry;
 
 /** Directory user implementation */
 class LdifUser extends DefaultLdapEntry implements DirectoryUser {
diff --git a/org.argeo.util/src/org/argeo/osgi/useradmin/OsUserDirectory.java b/org.argeo.cms/src/org/argeo/cms/osgi/useradmin/OsUserDirectory.java
similarity index 87%
rename from org.argeo.util/src/org/argeo/osgi/useradmin/OsUserDirectory.java
rename to org.argeo.cms/src/org/argeo/cms/osgi/useradmin/OsUserDirectory.java
index 5d7e97dde..950a401db 100644
--- a/org.argeo.util/src/org/argeo/osgi/useradmin/OsUserDirectory.java
+++ b/org.argeo.cms/src/org/argeo/cms/osgi/useradmin/OsUserDirectory.java
@@ -1,4 +1,4 @@
-package org.argeo.osgi.useradmin;
+package org.argeo.cms.osgi.useradmin;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -8,12 +8,12 @@ import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
 import javax.naming.ldap.LdapName;
 
-import org.argeo.util.directory.HierarchyUnit;
-import org.argeo.util.directory.ldap.AbstractLdapDirectory;
-import org.argeo.util.directory.ldap.AbstractLdapDirectoryDao;
-import org.argeo.util.directory.ldap.LdapEntry;
-import org.argeo.util.directory.ldap.LdapEntryWorkingCopy;
-import org.argeo.util.naming.LdapAttrs;
+import org.argeo.api.acr.ldap.LdapAttrs;
+import org.argeo.api.cms.directory.HierarchyUnit;
+import org.argeo.cms.directory.ldap.AbstractLdapDirectory;
+import org.argeo.cms.directory.ldap.AbstractLdapDirectoryDao;
+import org.argeo.cms.directory.ldap.LdapEntry;
+import org.argeo.cms.directory.ldap.LdapEntryWorkingCopy;
 
 /** Pseudo user directory to be used when logging in as OS user. */
 public class OsUserDirectory extends AbstractLdapDirectoryDao {
diff --git a/org.argeo.util/src/org/argeo/osgi/useradmin/OsUserUtils.java b/org.argeo.cms/src/org/argeo/cms/osgi/useradmin/OsUserUtils.java
similarity index 97%
rename from org.argeo.util/src/org/argeo/osgi/useradmin/OsUserUtils.java
rename to org.argeo.cms/src/org/argeo/cms/osgi/useradmin/OsUserUtils.java
index 5d0cbf687..f71878060 100644
--- a/org.argeo.util/src/org/argeo/osgi/useradmin/OsUserUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/osgi/useradmin/OsUserUtils.java
@@ -1,4 +1,4 @@
-package org.argeo.osgi.useradmin;
+package org.argeo.cms.osgi.useradmin;
 
 import java.net.URISyntaxException;
 import java.net.URL;
diff --git a/org.argeo.util/src/org/argeo/osgi/useradmin/TokenUtils.java b/org.argeo.cms/src/org/argeo/cms/osgi/useradmin/TokenUtils.java
similarity index 91%
rename from org.argeo.util/src/org/argeo/osgi/useradmin/TokenUtils.java
rename to org.argeo.cms/src/org/argeo/cms/osgi/useradmin/TokenUtils.java
index 178b4ae82..eb9429866 100644
--- a/org.argeo.util/src/org/argeo/osgi/useradmin/TokenUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/osgi/useradmin/TokenUtils.java
@@ -1,7 +1,7 @@
-package org.argeo.osgi.useradmin;
+package org.argeo.cms.osgi.useradmin;
 
-import static org.argeo.util.naming.LdapAttrs.description;
-import static org.argeo.util.naming.LdapAttrs.owner;
+import static org.argeo.api.acr.ldap.LdapAttrs.description;
+import static org.argeo.api.acr.ldap.LdapAttrs.owner;
 
 import java.security.Principal;
 import java.time.Instant;
@@ -12,7 +12,7 @@ import javax.naming.InvalidNameException;
 import javax.naming.ldap.LdapName;
 import javax.security.auth.Subject;
 
-import org.argeo.util.naming.NamingUtils;
+import org.argeo.api.acr.ldap.NamingUtils;
 import org.osgi.service.useradmin.Group;
 
 /**
diff --git a/org.argeo.util/src/org/argeo/osgi/useradmin/UserDirectory.java b/org.argeo.cms/src/org/argeo/cms/osgi/useradmin/UserDirectory.java
similarity index 74%
rename from org.argeo.util/src/org/argeo/osgi/useradmin/UserDirectory.java
rename to org.argeo.cms/src/org/argeo/cms/osgi/useradmin/UserDirectory.java
index 05ed7cf7c..463316ba1 100644
--- a/org.argeo.util/src/org/argeo/osgi/useradmin/UserDirectory.java
+++ b/org.argeo.cms/src/org/argeo/cms/osgi/useradmin/UserDirectory.java
@@ -1,7 +1,7 @@
-package org.argeo.osgi.useradmin;
+package org.argeo.cms.osgi.useradmin;
 
-import org.argeo.util.directory.Directory;
-import org.argeo.util.directory.HierarchyUnit;
+import org.argeo.api.cms.directory.Directory;
+import org.argeo.api.cms.directory.HierarchyUnit;
 import org.osgi.service.useradmin.Role;
 
 /** Information about a user directory. */
diff --git a/org.argeo.util/src/org/argeo/osgi/useradmin/jaas-os.cfg b/org.argeo.cms/src/org/argeo/cms/osgi/useradmin/jaas-os.cfg
similarity index 100%
rename from org.argeo.util/src/org/argeo/osgi/useradmin/jaas-os.cfg
rename to org.argeo.cms/src/org/argeo/cms/osgi/useradmin/jaas-os.cfg
diff --git a/org.argeo.util/src/org/argeo/osgi/useradmin/package-info.java b/org.argeo.cms/src/org/argeo/cms/osgi/useradmin/package-info.java
similarity index 61%
rename from org.argeo.util/src/org/argeo/osgi/useradmin/package-info.java
rename to org.argeo.cms/src/org/argeo/cms/osgi/useradmin/package-info.java
index c108d2c55..766c59b3e 100644
--- a/org.argeo.util/src/org/argeo/osgi/useradmin/package-info.java
+++ b/org.argeo.cms/src/org/argeo/cms/osgi/useradmin/package-info.java
@@ -1,2 +1,2 @@
 /** LDAP and LDIF based OSGi useradmin implementation. */
-package org.argeo.osgi.useradmin;
\ No newline at end of file
+package org.argeo.cms.osgi.useradmin;
\ No newline at end of file
diff --git a/org.argeo.util/src/org/argeo/util/directory/DirectoryConf.java b/org.argeo.cms/src/org/argeo/cms/runtime/DirectoryConf.java
similarity index 97%
rename from org.argeo.util/src/org/argeo/util/directory/DirectoryConf.java
rename to org.argeo.cms/src/org/argeo/cms/runtime/DirectoryConf.java
index 4450ca474..a4e44ccaf 100644
--- a/org.argeo.util/src/org/argeo/util/directory/DirectoryConf.java
+++ b/org.argeo.cms/src/org/argeo/cms/runtime/DirectoryConf.java
@@ -1,4 +1,4 @@
-package org.argeo.util.directory;
+package org.argeo.cms.runtime;
 
 import java.net.InetAddress;
 import java.net.URI;
@@ -9,8 +9,9 @@ import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
 
-import org.argeo.util.directory.ldap.IpaUtils;
-import org.argeo.util.naming.NamingUtils;
+import org.argeo.api.acr.ldap.NamingUtils;
+import org.argeo.api.cms.directory.DirectoryDigestUtils;
+import org.argeo.cms.directory.ldap.IpaUtils;
 
 /** Properties used to configure user admins. */
 public enum DirectoryConf {
diff --git a/org.argeo.cms/src/org/argeo/cms/runtime/StaticCms.java b/org.argeo.cms/src/org/argeo/cms/runtime/StaticCms.java
index e473d2799..0034e3f7b 100644
--- a/org.argeo.cms/src/org/argeo/cms/runtime/StaticCms.java
+++ b/org.argeo.cms/src/org/argeo/cms/runtime/StaticCms.java
@@ -9,6 +9,12 @@ import org.argeo.api.acr.spi.ProvidedRepository;
 import org.argeo.api.cms.CmsContext;
 import org.argeo.api.cms.CmsDeployment;
 import org.argeo.api.cms.CmsState;
+import org.argeo.api.cms.transaction.SimpleTransactionManager;
+import org.argeo.api.cms.transaction.WorkControl;
+import org.argeo.api.cms.transaction.WorkTransaction;
+import org.argeo.api.register.Component;
+import org.argeo.api.register.ComponentRegister;
+import org.argeo.api.register.SimpleRegister;
 import org.argeo.api.uuid.UuidFactory;
 import org.argeo.cms.CmsUserManager;
 import org.argeo.cms.acr.CmsUuidFactory;
@@ -18,12 +24,6 @@ import org.argeo.cms.internal.runtime.CmsDeploymentImpl;
 import org.argeo.cms.internal.runtime.CmsStateImpl;
 import org.argeo.cms.internal.runtime.CmsUserAdmin;
 import org.argeo.cms.internal.runtime.DeployedContentRepository;
-import org.argeo.util.register.Component;
-import org.argeo.util.register.ComponentRegister;
-import org.argeo.util.register.SimpleRegister;
-import org.argeo.util.transaction.SimpleTransactionManager;
-import org.argeo.util.transaction.WorkControl;
-import org.argeo.util.transaction.WorkTransaction;
 import org.osgi.service.useradmin.UserAdmin;
 
 /**
diff --git a/org.argeo.cms/src/org/argeo/cms/tabular/package-info.java b/org.argeo.cms/src/org/argeo/cms/tabular/package-info.java
deleted file mode 100644
index 6cb48d07f..000000000
--- a/org.argeo.cms/src/org/argeo/cms/tabular/package-info.java
+++ /dev/null
@@ -1,2 +0,0 @@
-/** Tabular format API. */
-package org.argeo.cms.tabular;
\ No newline at end of file
diff --git a/org.argeo.util/src/org/argeo/util/CompositeString.java b/org.argeo.cms/src/org/argeo/cms/util/CompositeString.java
similarity index 99%
rename from org.argeo.util/src/org/argeo/util/CompositeString.java
rename to org.argeo.cms/src/org/argeo/cms/util/CompositeString.java
index 2f8587dec..8ea16f7f3 100644
--- a/org.argeo.util/src/org/argeo/util/CompositeString.java
+++ b/org.argeo.cms/src/org/argeo/cms/util/CompositeString.java
@@ -1,4 +1,4 @@
-package org.argeo.util;
+package org.argeo.cms.util;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/org.argeo.util/src/org/argeo/util/CsvParser.java b/org.argeo.cms/src/org/argeo/cms/util/CsvParser.java
similarity index 99%
rename from org.argeo.util/src/org/argeo/util/CsvParser.java
rename to org.argeo.cms/src/org/argeo/cms/util/CsvParser.java
index b903f7722..f22a1e45f 100644
--- a/org.argeo.util/src/org/argeo/util/CsvParser.java
+++ b/org.argeo.cms/src/org/argeo/cms/util/CsvParser.java
@@ -1,4 +1,4 @@
-package org.argeo.util;
+package org.argeo.cms.util;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/org.argeo.util/src/org/argeo/util/CsvParserWithLinesAsMap.java b/org.argeo.cms/src/org/argeo/cms/util/CsvParserWithLinesAsMap.java
similarity index 97%
rename from org.argeo.util/src/org/argeo/util/CsvParserWithLinesAsMap.java
rename to org.argeo.cms/src/org/argeo/cms/util/CsvParserWithLinesAsMap.java
index 8eb6e9463..0a0382c1d 100644
--- a/org.argeo.util/src/org/argeo/util/CsvParserWithLinesAsMap.java
+++ b/org.argeo.cms/src/org/argeo/cms/util/CsvParserWithLinesAsMap.java
@@ -1,4 +1,4 @@
-package org.argeo.util;
+package org.argeo.cms.util;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/org.argeo.util/src/org/argeo/util/CsvWriter.java b/org.argeo.cms/src/org/argeo/cms/util/CsvWriter.java
similarity index 99%
rename from org.argeo.util/src/org/argeo/util/CsvWriter.java
rename to org.argeo.cms/src/org/argeo/cms/util/CsvWriter.java
index c3b3a3ad7..915a97fcf 100644
--- a/org.argeo.util/src/org/argeo/util/CsvWriter.java
+++ b/org.argeo.cms/src/org/argeo/cms/util/CsvWriter.java
@@ -1,4 +1,4 @@
-package org.argeo.util;
+package org.argeo.cms.util;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/org.argeo.util/src/org/argeo/util/CurrentSubject.java b/org.argeo.cms/src/org/argeo/cms/util/CurrentSubject.java
similarity index 98%
rename from org.argeo.util/src/org/argeo/util/CurrentSubject.java
rename to org.argeo.cms/src/org/argeo/cms/util/CurrentSubject.java
index 60ce3cf26..6a3dcbc62 100644
--- a/org.argeo.util/src/org/argeo/util/CurrentSubject.java
+++ b/org.argeo.cms/src/org/argeo/cms/util/CurrentSubject.java
@@ -1,4 +1,4 @@
-package org.argeo.util;
+package org.argeo.cms.util;
 
 import java.security.AccessController;
 import java.security.PrivilegedActionException;
diff --git a/org.argeo.util/src/org/argeo/util/DictionaryKeys.java b/org.argeo.cms/src/org/argeo/cms/util/DictionaryKeys.java
similarity index 96%
rename from org.argeo.util/src/org/argeo/util/DictionaryKeys.java
rename to org.argeo.cms/src/org/argeo/cms/util/DictionaryKeys.java
index d17c86f96..a9f6a318f 100644
--- a/org.argeo.util/src/org/argeo/util/DictionaryKeys.java
+++ b/org.argeo.cms/src/org/argeo/cms/util/DictionaryKeys.java
@@ -1,4 +1,4 @@
-package org.argeo.util;
+package org.argeo.cms.util;
 
 import java.util.Dictionary;
 import java.util.Enumeration;
diff --git a/org.argeo.util/src/org/argeo/util/DigestUtils.java b/org.argeo.cms/src/org/argeo/cms/util/DigestUtils.java
similarity index 99%
rename from org.argeo.util/src/org/argeo/util/DigestUtils.java
rename to org.argeo.cms/src/org/argeo/cms/util/DigestUtils.java
index 38b4e7032..047749f70 100644
--- a/org.argeo.util/src/org/argeo/util/DigestUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/util/DigestUtils.java
@@ -1,4 +1,4 @@
-package org.argeo.util;
+package org.argeo.cms.util;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/org.argeo.util/src/org/argeo/util/DirH.java b/org.argeo.cms/src/org/argeo/cms/util/DirH.java
similarity index 99%
rename from org.argeo.util/src/org/argeo/util/DirH.java
rename to org.argeo.cms/src/org/argeo/cms/util/DirH.java
index 013897d23..2596c61d1 100644
--- a/org.argeo.util/src/org/argeo/util/DirH.java
+++ b/org.argeo.cms/src/org/argeo/cms/util/DirH.java
@@ -1,4 +1,4 @@
-package org.argeo.util;
+package org.argeo.cms.util;
 
 import java.io.IOException;
 import java.io.PrintStream;
diff --git a/org.argeo.util/src/org/argeo/util/ExceptionsChain.java b/org.argeo.cms/src/org/argeo/cms/util/ExceptionsChain.java
similarity index 98%
rename from org.argeo.util/src/org/argeo/util/ExceptionsChain.java
rename to org.argeo.cms/src/org/argeo/cms/util/ExceptionsChain.java
index 9f824213d..e71cfb3ca 100644
--- a/org.argeo.util/src/org/argeo/util/ExceptionsChain.java
+++ b/org.argeo.cms/src/org/argeo/cms/util/ExceptionsChain.java
@@ -1,4 +1,4 @@
-package org.argeo.util;
+package org.argeo.cms.util;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/org.argeo.util/src/org/argeo/util/FsUtils.java b/org.argeo.cms/src/org/argeo/cms/util/FsUtils.java
similarity index 98%
rename from org.argeo.util/src/org/argeo/util/FsUtils.java
rename to org.argeo.cms/src/org/argeo/cms/util/FsUtils.java
index cd61b5619..26c05b60e 100644
--- a/org.argeo.util/src/org/argeo/util/FsUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/util/FsUtils.java
@@ -1,4 +1,4 @@
-package org.argeo.util;
+package org.argeo.cms.util;
 
 import java.io.IOException;
 import java.nio.file.FileVisitResult;
diff --git a/org.argeo.util/src/org/argeo/util/LangUtils.java b/org.argeo.cms/src/org/argeo/cms/util/LangUtils.java
similarity index 99%
rename from org.argeo.util/src/org/argeo/util/LangUtils.java
rename to org.argeo.cms/src/org/argeo/cms/util/LangUtils.java
index 1aee28c03..0e214271d 100644
--- a/org.argeo.util/src/org/argeo/util/LangUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/util/LangUtils.java
@@ -1,4 +1,4 @@
-package org.argeo.util;
+package org.argeo.cms.util;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/org.argeo.util/src/org/argeo/util/OS.java b/org.argeo.cms/src/org/argeo/cms/util/OS.java
similarity index 98%
rename from org.argeo.util/src/org/argeo/util/OS.java
rename to org.argeo.cms/src/org/argeo/cms/util/OS.java
index 174f45b78..c63d7a190 100644
--- a/org.argeo.util/src/org/argeo/util/OS.java
+++ b/org.argeo.cms/src/org/argeo/cms/util/OS.java
@@ -1,4 +1,4 @@
-package org.argeo.util;
+package org.argeo.cms.util;
 
 import java.io.File;
 import java.nio.file.Path;
diff --git a/org.argeo.util/src/org/argeo/util/PasswordEncryption.java b/org.argeo.cms/src/org/argeo/cms/util/PasswordEncryption.java
similarity index 99%
rename from org.argeo.util/src/org/argeo/util/PasswordEncryption.java
rename to org.argeo.cms/src/org/argeo/cms/util/PasswordEncryption.java
index c95c7879e..c50f415e3 100644
--- a/org.argeo.util/src/org/argeo/util/PasswordEncryption.java
+++ b/org.argeo.cms/src/org/argeo/cms/util/PasswordEncryption.java
@@ -1,4 +1,4 @@
-package org.argeo.util;
+package org.argeo.cms.util;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/org.argeo.util/src/org/argeo/util/ServiceChannel.java b/org.argeo.cms/src/org/argeo/cms/util/ServiceChannel.java
similarity index 98%
rename from org.argeo.util/src/org/argeo/util/ServiceChannel.java
rename to org.argeo.cms/src/org/argeo/cms/util/ServiceChannel.java
index 799738414..8cdbcadc4 100644
--- a/org.argeo.util/src/org/argeo/util/ServiceChannel.java
+++ b/org.argeo.cms/src/org/argeo/cms/util/ServiceChannel.java
@@ -1,4 +1,4 @@
-package org.argeo.util;
+package org.argeo.cms.util;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
diff --git a/org.argeo.util/src/org/argeo/util/StreamUtils.java b/org.argeo.cms/src/org/argeo/cms/util/StreamUtils.java
similarity index 98%
rename from org.argeo.util/src/org/argeo/util/StreamUtils.java
rename to org.argeo.cms/src/org/argeo/cms/util/StreamUtils.java
index 5e4e636fc..a589e739a 100644
--- a/org.argeo.util/src/org/argeo/util/StreamUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/util/StreamUtils.java
@@ -1,4 +1,4 @@
-package org.argeo.util;
+package org.argeo.cms.util;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
diff --git a/org.argeo.util/src/org/argeo/util/Tester.java b/org.argeo.cms/src/org/argeo/cms/util/Tester.java
similarity index 99%
rename from org.argeo.util/src/org/argeo/util/Tester.java
rename to org.argeo.cms/src/org/argeo/cms/util/Tester.java
index 31a2be4ec..fa62cd796 100644
--- a/org.argeo.util/src/org/argeo/util/Tester.java
+++ b/org.argeo.cms/src/org/argeo/cms/util/Tester.java
@@ -1,4 +1,4 @@
-package org.argeo.util;
+package org.argeo.cms.util;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
diff --git a/org.argeo.util/src/org/argeo/util/TesterStatus.java b/org.argeo.cms/src/org/argeo/cms/util/TesterStatus.java
similarity index 98%
rename from org.argeo.util/src/org/argeo/util/TesterStatus.java
rename to org.argeo.cms/src/org/argeo/cms/util/TesterStatus.java
index d1d14ed06..09ab432b2 100644
--- a/org.argeo.util/src/org/argeo/util/TesterStatus.java
+++ b/org.argeo.cms/src/org/argeo/cms/util/TesterStatus.java
@@ -1,4 +1,4 @@
-package org.argeo.util;
+package org.argeo.cms.util;
 
 import java.io.Serializable;
 
diff --git a/org.argeo.util/src/org/argeo/util/Throughput.java b/org.argeo.cms/src/org/argeo/cms/util/Throughput.java
similarity index 98%
rename from org.argeo.util/src/org/argeo/util/Throughput.java
rename to org.argeo.cms/src/org/argeo/cms/util/Throughput.java
index 266ddbc58..4fc15f960 100644
--- a/org.argeo.util/src/org/argeo/util/Throughput.java
+++ b/org.argeo.cms/src/org/argeo/cms/util/Throughput.java
@@ -1,4 +1,4 @@
-package org.argeo.util;
+package org.argeo.cms.util;
 
 import java.text.NumberFormat;
 import java.text.ParseException;
diff --git a/org.argeo.util/src/org/argeo/util/package-info.java b/org.argeo.cms/src/org/argeo/cms/util/package-info.java
similarity index 53%
rename from org.argeo.util/src/org/argeo/util/package-info.java
rename to org.argeo.cms/src/org/argeo/cms/util/package-info.java
index 4354b0a14..5efc68afb 100644
--- a/org.argeo.util/src/org/argeo/util/package-info.java
+++ b/org.argeo.cms/src/org/argeo/cms/util/package-info.java
@@ -1,2 +1,2 @@
 /** Generic Java utilities. */
-package org.argeo.util;
\ No newline at end of file
+package org.argeo.cms.util;
\ No newline at end of file
diff --git a/org.argeo.util/bnd.bnd b/org.argeo.util/bnd.bnd
deleted file mode 100644
index 5f42f7786..000000000
--- a/org.argeo.util/bnd.bnd
+++ /dev/null
@@ -1,6 +0,0 @@
-Bundle-Activator: org.argeo.osgi.internal.EnterpriseActivator
-Bundle-ActivationPolicy: lazy
-
-Import-Package:	org.osgi.*;version=0.0.0,\
-!org.apache.commons.logging,\
-*				
diff --git a/org.argeo.util/src/org/argeo/osgi/internal/EnterpriseActivator.java b/org.argeo.util/src/org/argeo/osgi/internal/EnterpriseActivator.java
deleted file mode 100644
index bb495dd12..000000000
--- a/org.argeo.util/src/org/argeo/osgi/internal/EnterpriseActivator.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.argeo.osgi.internal;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-/**
- * Called to gather information about the OSGi runtime. Should not activate
- * anything else that canonical monitoring services (not creating implicit
- * APIs), which is the responsibility of higher levels.
- */
-public class EnterpriseActivator implements BundleActivator {
-
-	@Override
-	public void start(BundleContext context) throws Exception {
-	}
-
-	@Override
-	public void stop(BundleContext context) throws Exception {
-	}
-
-}
diff --git a/org.argeo.util/src/org/argeo/osgi/provisioning/SimpleProvisioningService.java b/org.argeo.util/src/org/argeo/osgi/provisioning/SimpleProvisioningService.java
deleted file mode 100644
index f5e858999..000000000
--- a/org.argeo.util/src/org/argeo/osgi/provisioning/SimpleProvisioningService.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package org.argeo.osgi.provisioning;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.Dictionary;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.zip.ZipInputStream;
-
-import org.osgi.service.provisioning.ProvisioningService;
-
-public class SimpleProvisioningService implements ProvisioningService {
-	private Map<String, Object> map = Collections.synchronizedSortedMap(new TreeMap<>());
-
-	public SimpleProvisioningService() {
-		// update count
-		map.put(PROVISIONING_UPDATE_COUNT, 0);
-	}
-
-	@Override
-	public Dictionary<String, Object> getInformation() {
-		return new Information();
-	}
-
-	@SuppressWarnings("rawtypes")
-	@Override
-	public synchronized void setInformation(Dictionary info) {
-		map.clear();
-		addInformation(info);
-	}
-
-	@SuppressWarnings({ "rawtypes", "unchecked" })
-	@Override
-	public synchronized void addInformation(Dictionary info) {
-		Enumeration<String> e = info.keys();
-		while (e.hasMoreElements()) {
-			String key = e.nextElement();
-			map.put(key, info.get(key));
-		}
-		incrementProvisioningUpdateCount();
-	}
-
-	protected synchronized void incrementProvisioningUpdateCount() {
-		Integer current = (Integer) map.get(PROVISIONING_UPDATE_COUNT);
-		Integer newValue = current + 1;
-		map.put(PROVISIONING_UPDATE_COUNT, newValue);
-	}
-
-	@Override
-	public synchronized void addInformation(ZipInputStream zis) throws IOException {
-		throw new UnsupportedOperationException();
-	}
-
-	
-	
-	class Information extends Dictionary<String, Object> {
-
-		@Override
-		public int size() {
-			return map.size();
-		}
-
-		@Override
-		public boolean isEmpty() {
-			return map.isEmpty();
-		}
-
-		@Override
-		public Enumeration<String> keys() {
-			Iterator<String> it = map.keySet().iterator();
-			return new Enumeration<String>() {
-
-				@Override
-				public boolean hasMoreElements() {
-					return it.hasNext();
-				}
-
-				@Override
-				public String nextElement() {
-					return it.next();
-				}
-
-			};
-		}
-
-		@Override
-		public Enumeration<Object> elements() {
-			Iterator<Object> it = map.values().iterator();
-			return new Enumeration<Object>() {
-
-				@Override
-				public boolean hasMoreElements() {
-					return it.hasNext();
-				}
-
-				@Override
-				public Object nextElement() {
-					return it.next();
-				}
-
-			};
-		}
-
-		@Override
-		public Object get(Object key) {
-			return map.get(key);
-		}
-
-		@Override
-		public Object put(String key, Object value) {
-			throw new UnsupportedOperationException();
-		}
-
-		@Override
-		public Object remove(Object key) {
-			throw new UnsupportedOperationException();
-		}
-
-	}
-}
diff --git a/org.argeo.util/src/org/argeo/osgi/provisioning/package-info.java b/org.argeo.util/src/org/argeo/osgi/provisioning/package-info.java
deleted file mode 100644
index 1859887e2..000000000
--- a/org.argeo.util/src/org/argeo/osgi/provisioning/package-info.java
+++ /dev/null
@@ -1,2 +0,0 @@
-/** OSGi provisioning support. */
-package org.argeo.osgi.provisioning;
\ No newline at end of file
diff --git a/org.argeo.util/src/org/argeo/osgi/util/OnServiceRegistration.java b/org.argeo.util/src/org/argeo/osgi/util/OnServiceRegistration.java
deleted file mode 100644
index 5a6760e0f..000000000
--- a/org.argeo.util/src/org/argeo/osgi/util/OnServiceRegistration.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package org.argeo.osgi.util;
-
-import java.util.concurrent.CancellationException;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.function.Function;
-
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.FrameworkUtil;
-import org.osgi.framework.ServiceReference;
-import org.osgi.util.tracker.ServiceTracker;
-
-public class OnServiceRegistration<R> implements Future<R> {
-	private BundleContext ownBundleContext = FrameworkUtil.getBundle(OnServiceRegistration.class).getBundleContext();
-
-	private ServiceTracker<?, ?> st;
-
-	private R result;
-	private boolean cancelled = false;
-	private Throwable exception;
-
-	public <T> OnServiceRegistration(Class<T> clss, Function<T, R> function) {
-		this(null, clss, function);
-	}
-
-	public <T> OnServiceRegistration(BundleContext bundleContext, Class<T> clss, Function<T, R> function) {
-		st = new ServiceTracker<T, T>(bundleContext != null ? bundleContext : ownBundleContext, clss, null) {
-
-			@Override
-			public T addingService(ServiceReference<T> reference) {
-				T service = super.addingService(reference);
-				try {
-					if (result != null)// we only want the first one
-						return service;
-					result = function.apply(service);
-					return service;
-				} catch (Exception e) {
-					exception = e;
-					return service;
-				} finally {
-					close();
-				}
-			}
-		};
-		st.open(bundleContext == null);
-	}
-
-	@Override
-	public boolean cancel(boolean mayInterruptIfRunning) {
-		if (result != null || exception != null || cancelled)
-			return false;
-		st.close();
-		cancelled = true;
-		return true;
-	}
-
-	@Override
-	public boolean isCancelled() {
-		return cancelled;
-	}
-
-	@Override
-	public boolean isDone() {
-		return result != null || cancelled;
-	}
-
-	@Override
-	public R get() throws InterruptedException, ExecutionException {
-		st.waitForService(0);
-		return tryGetResult();
-	}
-
-	@Override
-	public R get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
-		st.waitForService(TimeUnit.MILLISECONDS.convert(timeout, unit));
-		if (result == null)
-			throw new TimeoutException("No result after " + timeout + " " + unit);
-		return tryGetResult();
-	}
-
-	protected R tryGetResult() throws ExecutionException, CancellationException {
-		if (cancelled)
-			throw new CancellationException();
-		if (exception != null)
-			throw new ExecutionException(exception);
-		if (result == null)// this should not happen
-			try {
-				throw new IllegalStateException("No result available");
-			} catch (Exception e) {
-				exception = e;
-				throw new ExecutionException(e);
-			}
-		return result;
-	}
-
-}
diff --git a/org.argeo.util/src/org/argeo/osgi/util/OsgiRegister.java b/org.argeo.util/src/org/argeo/osgi/util/OsgiRegister.java
deleted file mode 100644
index 5728b90db..000000000
--- a/org.argeo.util/src/org/argeo/osgi/util/OsgiRegister.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.argeo.osgi.util;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ForkJoinPool;
-
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
-
-public class OsgiRegister {
-	private final BundleContext bundleContext;
-	private Executor executor;
-
-	private CompletableFuture<Void> shutdownStarting = new CompletableFuture<Void>();
-
-	public OsgiRegister(BundleContext bundleContext) {
-		this.bundleContext = bundleContext;
-		// TODO experiment with dedicated executors
-		this.executor = ForkJoinPool.commonPool();
-	}
-
-	public <T> void set(T obj, Class<T> clss, Map<String, Object> attributes, Class<?>... classes) {
-		CompletableFuture<ServiceRegistration<?>> srf = new CompletableFuture<ServiceRegistration<?>>();
-		CompletableFuture<T> postRegistration = CompletableFuture.supplyAsync(() -> {
-			List<String> lst = new ArrayList<>();
-			lst.add(clss.getName());
-			for (Class<?> c : classes) {
-				lst.add(c.getName());
-			}
-			ServiceRegistration<?> sr = bundleContext.registerService(lst.toArray(new String[lst.size()]), obj,
-					new Hashtable<String, Object>(attributes));
-			srf.complete(sr);
-			return obj;
-		}, executor);
-//		Singleton<T> singleton = new Singleton<T>(clss, postRegistration);
-
-//		shutdownStarting. //
-//				thenCompose(singleton::prepareUnregistration). //
-//				thenRunAsync(() -> {
-//					try {
-//						srf.get().unregister();
-//					} catch (InterruptedException | ExecutionException e) {
-//						e.printStackTrace();
-//					}
-//				}, executor);
-//		return singleton;
-	}
-
-	public void shutdown() {
-		shutdownStarting.complete(null);
-	}
-}
diff --git a/org.argeo.util/src/org/argeo/util/internal/DisplayQName.java b/org.argeo.util/src/org/argeo/util/internal/DisplayQName.java
deleted file mode 100644
index 6cc39dc6a..000000000
--- a/org.argeo.util/src/org/argeo/util/internal/DisplayQName.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.argeo.util.internal;
-
-import javax.xml.namespace.QName;
-
-public class DisplayQName extends QName {
-		private static final long serialVersionUID = 2376484886212253123L;
-
-		public DisplayQName(String namespaceURI, String localPart, String prefix) {
-			super(namespaceURI, localPart, prefix);
-		}
-
-		public DisplayQName(String localPart) {
-			super(localPart);
-		}
-
-		@Override
-		public String toString() {
-			String prefix = getPrefix();
-			assert prefix != null;
-			return "".equals(prefix) ? getLocalPart() : prefix + ":" + getLocalPart();
-		}
-
-	}
\ No newline at end of file
diff --git a/org.argeo.util/src/org/argeo/util/naming/LdapAttrs.csv b/org.argeo.util/src/org/argeo/util/naming/LdapAttrs.csv
deleted file mode 100644
index 676d72720..000000000
--- a/org.argeo.util/src/org/argeo/util/naming/LdapAttrs.csv
+++ /dev/null
@@ -1,129 +0,0 @@
-uid,,,0.9.2342.19200300.100.1.1,,RFC 4519
-mail,,,0.9.2342.19200300.100.1.3,,RFC 4524
-info,,,0.9.2342.19200300.100.1.4,,RFC 4524
-drink,,,0.9.2342.19200300.100.1.5,,RFC 4524
-roomNumber,,,0.9.2342.19200300.100.1.6,,RFC 4524
-photo,,,0.9.2342.19200300.100.1.7,,RFC 2798
-userClass,,,0.9.2342.19200300.100.1.8,,RFC 4524
-host,,,0.9.2342.19200300.100.1.9,,RFC 4524
-manager,,,0.9.2342.19200300.100.1.10,,RFC 4524
-documentIdentifier,,,0.9.2342.19200300.100.1.11,,RFC 4524
-documentTitle,,,0.9.2342.19200300.100.1.12,,RFC 4524
-documentVersion,,,0.9.2342.19200300.100.1.13,,RFC 4524
-documentAuthor,,,0.9.2342.19200300.100.1.14,,RFC 4524
-documentLocation,,,0.9.2342.19200300.100.1.15,,RFC 4524
-homePhone,,,0.9.2342.19200300.100.1.20,,RFC 4524
-secretary,,,0.9.2342.19200300.100.1.21,,RFC 4524
-dc,,,0.9.2342.19200300.100.1.25,,RFC 4519
-associatedDomain,,,0.9.2342.19200300.100.1.37,,RFC 4524
-associatedName,,,0.9.2342.19200300.100.1.38,,RFC 4524
-homePostalAddress,,,0.9.2342.19200300.100.1.39,,RFC 4524
-personalTitle,,,0.9.2342.19200300.100.1.40,,RFC 4524
-mobile,,,0.9.2342.19200300.100.1.41,,RFC 4524
-pager,,,0.9.2342.19200300.100.1.42,,RFC 4524
-co,,,0.9.2342.19200300.100.1.43,,RFC 4524
-uniqueIdentifier,,,0.9.2342.19200300.100.1.44,,RFC 4524
-organizationalStatus,,,0.9.2342.19200300.100.1.45,,RFC 4524
-buildingName,,,0.9.2342.19200300.100.1.48,,RFC 4524
-audio,,,0.9.2342.19200300.100.1.55,,RFC 2798
-documentPublisher,,,0.9.2342.19200300.100.1.56,,RFC 4524
-jpegPhoto,,,0.9.2342.19200300.100.1.60,,RFC 2798
-vendorName,,,1.3.6.1.1.4,,RFC 3045
-vendorVersion,,,1.3.6.1.1.5,,RFC 3045
-entryUUID,,,1.3.6.1.1.16.4,,RFC 4530
-entryDN,,,1.3.6.1.1.20,,RFC 5020
-labeledURI,,,1.3.6.1.4.1.250.1.57,,RFC 2798
-numSubordinates,,,1.3.6.1.4.1.453.16.2.103,,draft-ietf-boreham-numsubordinates
-namingContexts,,,1.3.6.1.4.1.1466.101.120.5,,RFC 4512
-altServer,,,1.3.6.1.4.1.1466.101.120.6,,RFC 4512
-supportedExtension,,,1.3.6.1.4.1.1466.101.120.7,,RFC 4512
-supportedControl,,,1.3.6.1.4.1.1466.101.120.13,,RFC 4512
-supportedSASLMechanisms,,,1.3.6.1.4.1.1466.101.120.14,,RFC 4512
-supportedLDAPVersion,,,1.3.6.1.4.1.1466.101.120.15,,RFC 4512
-ldapSyntaxes,,,1.3.6.1.4.1.1466.101.120.16,,RFC 4512
-supportedAuthPasswordSchemes,,,1.3.6.1.4.1.4203.1.3.3,,RFC 3112
-authPassword,,,1.3.6.1.4.1.4203.1.3.4,,RFC 3112
-supportedFeatures,,,1.3.6.1.4.1.4203.1.3.5,,RFC 4512
-inheritable,,,1.3.6.1.4.1.7628.5.4.1,,draft-ietf-ldup-subentry
-blockInheritance,,,1.3.6.1.4.1.7628.5.4.2,,draft-ietf-ldup-subentry
-objectClass,,,2.5.4.0,,RFC 4512
-aliasedObjectName,,,2.5.4.1,,RFC 4512
-cn,,,2.5.4.3,,RFC 4519
-sn,,,2.5.4.4,,RFC 4519
-serialNumber,,,2.5.4.5,,RFC 4519
-c,,,2.5.4.6,,RFC 4519
-l,,,2.5.4.7,,RFC 4519
-st,,,2.5.4.8,,RFC 4519
-street,,,2.5.4.9,,RFC 4519
-o,,,2.5.4.10,,RFC 4519
-ou,,,2.5.4.11,,RFC 4519
-title,,,2.5.4.12,,RFC 4519
-description,,,2.5.4.13,,RFC 4519
-searchGuide,,,2.5.4.14,,RFC 4519
-businessCategory,,,2.5.4.15,,RFC 4519
-postalAddress,,,2.5.4.16,,RFC 4519
-postalCode,,,2.5.4.17,,RFC 4519
-postOfficeBox,,,2.5.4.18,,RFC 4519
-physicalDeliveryOfficeName,,,2.5.4.19,,RFC 4519
-telephoneNumber,,,2.5.4.20,,RFC 4519
-telexNumber,,,2.5.4.21,,RFC 4519
-teletexTerminalIdentifier,,,2.5.4.22,,RFC 4519
-facsimileTelephoneNumber,,,2.5.4.23,,RFC 4519
-x121Address,,,2.5.4.24,,RFC 4519
-internationalISDNNumber,,,2.5.4.25,,RFC 4519
-registeredAddress,,,2.5.4.26,,RFC 4519
-destinationIndicator,,,2.5.4.27,,RFC 4519
-preferredDeliveryMethod,,,2.5.4.28,,RFC 4519
-member,,,2.5.4.31,,RFC 4519
-owner,,,2.5.4.32,,RFC 4519
-roleOccupant,,,2.5.4.33,,RFC 4519
-seeAlso,,,2.5.4.34,,RFC 4519
-userPassword,,,2.5.4.35,,RFC 4519
-userCertificate,,,2.5.4.36,,RFC 4523
-cACertificate,,,2.5.4.37,,RFC 4523
-authorityRevocationList,,,2.5.4.38,,RFC 4523
-certificateRevocationList,,,2.5.4.39,,RFC 4523
-crossCertificatePair,,,2.5.4.40,,RFC 4523
-name,,,2.5.4.41,,RFC 4519
-givenName,,,2.5.4.42,,RFC 4519
-initials,,,2.5.4.43,,RFC 4519
-generationQualifier,,,2.5.4.44,,RFC 4519
-x500UniqueIdentifier,,,2.5.4.45,,RFC 4519
-dnQualifier,,,2.5.4.46,,RFC 4519
-enhancedSearchGuide,,,2.5.4.47,,RFC 4519
-distinguishedName,,,2.5.4.49,,RFC 4519
-uniqueMember,,,2.5.4.50,,RFC 4519
-houseIdentifier,,,2.5.4.51,,RFC 4519
-supportedAlgorithms,,,2.5.4.52,,RFC 4523
-deltaRevocationList,,,2.5.4.53,,RFC 4523
-createTimestamp,,,2.5.18.1,,RFC 4512
-modifyTimestamp,,,2.5.18.2,,RFC 4512
-creatorsName,,,2.5.18.3,,RFC 4512
-modifiersName,,,2.5.18.4,,RFC 4512
-subschemaSubentry,,,2.5.18.10,,RFC 4512
-dITStructureRules,,,2.5.21.1,,RFC 4512
-dITContentRules,,,2.5.21.2,,RFC 4512
-matchingRules,,,2.5.21.4,,RFC 4512
-attributeTypes,,,2.5.21.5,,RFC 4512
-objectClasses,,,2.5.21.6,,RFC 4512
-nameForms,,,2.5.21.7,,RFC 4512
-matchingRuleUse,,,2.5.21.8,,RFC 4512
-structuralObjectClass,,,2.5.21.9,,RFC 4512
-governingStructureRule,,,2.5.21.10,,RFC 4512
-carLicense,,,2.16.840.1.113730.3.1.1,,RFC 2798
-departmentNumber,,,2.16.840.1.113730.3.1.2,,RFC 2798
-employeeNumber,,,2.16.840.1.113730.3.1.3,,RFC 2798
-employeeType,,,2.16.840.1.113730.3.1.4,,RFC 2798
-changeNumber,,,2.16.840.1.113730.3.1.5,,draft-good-ldap-changelog
-targetDN,,,2.16.840.1.113730.3.1.6,,draft-good-ldap-changelog
-changeType,,,2.16.840.1.113730.3.1.7,,draft-good-ldap-changelog
-changes,,,2.16.840.1.113730.3.1.8,,draft-good-ldap-changelog
-newRDN,,,2.16.840.1.113730.3.1.9,,draft-good-ldap-changelog
-deleteOldRDN,,,2.16.840.1.113730.3.1.10,,draft-good-ldap-changelog
-newSuperior,,,2.16.840.1.113730.3.1.11,,draft-good-ldap-changelog
-ref,,,2.16.840.1.113730.3.1.34,,RFC 3296
-changelog,,,2.16.840.1.113730.3.1.35,,draft-good-ldap-changelog
-preferredLanguage,,,2.16.840.1.113730.3.1.39,,RFC 2798
-userSMIMECertificate,,,2.16.840.1.113730.3.1.40,,RFC 2798
-userPKCS12,,,2.16.840.1.113730.3.1.216,,RFC 2798
-displayName,,,2.16.840.1.113730.3.1.241,,RFC 2798
diff --git a/org.argeo.util/src/org/argeo/util/naming/LdapObjs.csv b/org.argeo.util/src/org/argeo/util/naming/LdapObjs.csv
deleted file mode 100644
index 3d907cbeb..000000000
--- a/org.argeo.util/src/org/argeo/util/naming/LdapObjs.csv
+++ /dev/null
@@ -1,42 +0,0 @@
-account,,,0.9.2342.19200300.100.4.5,,RFC 4524
-document,,,0.9.2342.19200300.100.4.6,,RFC 4524
-room,,,0.9.2342.19200300.100.4.7,,RFC 4524
-documentSeries,,,0.9.2342.19200300.100.4.9,,RFC 4524
-domain,,,0.9.2342.19200300.100.4.13,,RFC 4524
-rFC822localPart,,,0.9.2342.19200300.100.4.14,,RFC 4524
-domainRelatedObject,,,0.9.2342.19200300.100.4.17,,RFC 4524
-friendlyCountry,,,0.9.2342.19200300.100.4.18,,RFC 4524
-simpleSecurityObject,,,0.9.2342.19200300.100.4.19,,RFC 4524
-uidObject,,,1.3.6.1.1.3.1,,RFC 4519
-extensibleObject,,,1.3.6.1.4.1.1466.101.120.111,,RFC 4512
-dcObject,,,1.3.6.1.4.1.1466.344,,RFC 4519
-authPasswordObject,,,1.3.6.1.4.1.4203.1.4.7,,RFC 3112
-namedObject,,,1.3.6.1.4.1.5322.13.1.1,,draft-howard-namedobject
-inheritableLDAPSubEntry,,,1.3.6.1.4.1.7628.5.6.1.1,,draft-ietf-ldup-subentry
-top,,,2.5.6.0,,RFC 4512
-alias,,,2.5.6.1,,RFC 4512
-country,,,2.5.6.2,,RFC 4519
-locality,,,2.5.6.3,,RFC 4519
-organization,,,2.5.6.4,,RFC 4519
-organizationalUnit,,,2.5.6.5,,RFC 4519
-person,,,2.5.6.6,,RFC 4519
-organizationalPerson,,,2.5.6.7,,RFC 4519
-organizationalRole,,,2.5.6.8,,RFC 4519
-groupOfNames,,,2.5.6.9,,RFC 4519
-residentialPerson,,,2.5.6.10,,RFC 4519
-applicationProcess,,,2.5.6.11,,RFC 4519
-device,,,2.5.6.14,,RFC 4519
-strongAuthenticationUser,,,2.5.6.15,,RFC 4523
-certificationAuthority,,,2.5.6.16,,RFC 4523
-certificationAuthority-V2,,,2.5.6.16.2,,RFC 4523
-groupOfUniqueNames,,,2.5.6.17,,RFC 4519
-userSecurityInformation,,,2.5.6.18,,RFC 4523
-cRLDistributionPoint,,,2.5.6.19,,RFC 4523
-pkiUser,,,2.5.6.21,,RFC 4523
-pkiCA,,,2.5.6.22,,RFC 4523
-deltaCRL,,,2.5.6.23,,RFC 4523
-subschema,,,2.5.20.1,,RFC 4512
-ldapSubEntry,,,2.16.840.1.113719.2.142.6.1.1,,draft-ietf-ldup-subentry
-changeLogEntry,,,2.16.840.1.113730.3.2.1,,draft-good-ldap-changelog
-inetOrgPerson,,,2.16.840.1.113730.3.2.2,,RFC 2798
-referral,,,2.16.840.1.113730.3.2.6,,RFC 3296
diff --git a/org.argeo.util/src/org/argeo/util/naming/package-info.java b/org.argeo.util/src/org/argeo/util/naming/package-info.java
deleted file mode 100644
index f62af365e..000000000
--- a/org.argeo.util/src/org/argeo/util/naming/package-info.java
+++ /dev/null
@@ -1,2 +0,0 @@
-/** Generic naming and LDAP support. */
-package org.argeo.util.naming;
\ No newline at end of file
diff --git a/osgi/equinox/org.argeo.cms.lib.equinox/src/org/argeo/cms/servlet/internal/jetty/JettyConfig.java b/osgi/equinox/org.argeo.cms.lib.equinox/src/org/argeo/cms/servlet/internal/jetty/JettyConfig.java
index 50be8b7a7..2cd600152 100644
--- a/osgi/equinox/org.argeo.cms.lib.equinox/src/org/argeo/cms/servlet/internal/jetty/JettyConfig.java
+++ b/osgi/equinox/org.argeo.cms.lib.equinox/src/org/argeo/cms/servlet/internal/jetty/JettyConfig.java
@@ -14,9 +14,9 @@ import org.argeo.api.cms.CmsConstants;
 import org.argeo.api.cms.CmsLog;
 import org.argeo.api.cms.CmsState;
 import org.argeo.cms.CmsDeployProperty;
+import org.argeo.cms.util.LangUtils;
 import org.argeo.cms.websocket.server.CmsWebSocketConfigurator;
 import org.argeo.cms.websocket.server.TestEndpoint;
-import org.argeo.util.LangUtils;
 import org.eclipse.equinox.http.jetty.JettyConfigurator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
diff --git a/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/ChangePassword.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/ChangePassword.java
index 393aede8f..dd761267d 100644
--- a/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/ChangePassword.java
+++ b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/ChangePassword.java
@@ -12,11 +12,11 @@ import javax.inject.Inject;
 import javax.naming.InvalidNameException;
 import javax.naming.ldap.LdapName;
 
+import org.argeo.api.cms.keyring.CryptoKeyring;
+import org.argeo.api.cms.transaction.WorkTransaction;
 import org.argeo.cms.auth.CurrentUser;
-import org.argeo.cms.security.CryptoKeyring;
 import org.argeo.cms.swt.dialogs.CmsFeedback;
 import org.argeo.cms.swt.dialogs.CmsMessageDialog;
-import org.argeo.util.transaction.WorkTransaction;
 import org.eclipse.e4.core.di.annotations.Execute;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.jface.dialogs.Dialog;
diff --git a/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/CloseWorkbench.java b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/CloseWorkbench.java
index f77c94d7c..91070f222 100644
--- a/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/CloseWorkbench.java
+++ b/swt/org.argeo.cms.e4/src/org/argeo/cms/e4/handlers/CloseWorkbench.java
@@ -3,7 +3,7 @@ package org.argeo.cms.e4.handlers;
 import javax.security.auth.Subject;
 
 import org.argeo.cms.auth.CurrentUser;
-import org.argeo.util.CurrentSubject;
+import org.argeo.cms.util.CurrentSubject;
 import org.eclipse.e4.core.di.annotations.Execute;
 import org.eclipse.e4.ui.workbench.IWorkbench;
 
diff --git a/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/AbstractSwtCmsView.java b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/AbstractSwtCmsView.java
index ddb6e1b33..59624f93c 100644
--- a/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/AbstractSwtCmsView.java
+++ b/swt/org.argeo.cms.swt/src/org/argeo/cms/swt/AbstractSwtCmsView.java
@@ -18,7 +18,7 @@ import org.argeo.api.cms.ux.CmsUi;
 import org.argeo.api.cms.ux.CmsView;
 import org.argeo.api.cms.ux.UxContext;
 import org.argeo.cms.auth.CurrentUser;
-import org.argeo.util.CurrentSubject;
+import org.argeo.cms.util.CurrentSubject;
 import org.eclipse.swt.widgets.Display;
 
 public abstract class AbstractSwtCmsView implements CmsView {
diff --git a/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/CmsWebApp.java b/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/CmsWebApp.java
index 31555d168..67fa5ceac 100644
--- a/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/CmsWebApp.java
+++ b/swt/rap/org.argeo.cms.swt.rap/src/org/argeo/cms/web/CmsWebApp.java
@@ -12,7 +12,7 @@ import org.argeo.api.cms.CmsLog;
 import org.argeo.api.cms.ux.CmsTheme;
 import org.argeo.api.cms.ux.CmsView;
 import org.argeo.cms.swt.CmsSwtUtils;
-import org.argeo.util.LangUtils;
+import org.argeo.cms.util.LangUtils;
 import org.eclipse.rap.rwt.RWT;
 import org.eclipse.rap.rwt.application.Application;
 import org.eclipse.rap.rwt.application.Application.OperationMode;
diff --git a/swt/rcp/org.argeo.cms.swt.rcp/src/org/argeo/cms/ui/rcp/CmsRcpDisplayFactory.java b/swt/rcp/org.argeo.cms.swt.rcp/src/org/argeo/cms/ui/rcp/CmsRcpDisplayFactory.java
index e94825db8..a83a54db3 100644
--- a/swt/rcp/org.argeo.cms.swt.rcp/src/org/argeo/cms/ui/rcp/CmsRcpDisplayFactory.java
+++ b/swt/rcp/org.argeo.cms.swt.rcp/src/org/argeo/cms/ui/rcp/CmsRcpDisplayFactory.java
@@ -5,7 +5,7 @@ import java.lang.System.Logger.Level;
 import java.nio.file.Path;
 
 import org.argeo.api.cms.CmsApp;
-import org.argeo.util.OS;
+import org.argeo.cms.util.OS;
 import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.widgets.Display;
 
diff --git a/swt/rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/rcp/internal/rwt/RcpResourceManager.java b/swt/rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/rcp/internal/rwt/RcpResourceManager.java
index ac4217184..47ff35dc0 100644
--- a/swt/rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/rcp/internal/rwt/RcpResourceManager.java
+++ b/swt/rcp/org.argeo.swt.specific.rcp/src/org/argeo/eclipse/ui/rcp/internal/rwt/RcpResourceManager.java
@@ -7,7 +7,7 @@ import java.util.Collections;
 import java.util.Map;
 import java.util.TreeMap;
 
-import org.argeo.util.StreamUtils;
+import org.argeo.cms.util.StreamUtils;
 import org.eclipse.rap.rwt.service.ResourceManager;
 
 public class RcpResourceManager implements ResourceManager {
-- 
2.30.2