From 942fd932e1f6ed3319575c4c1d944912dfca9fa5 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 13 Jan 2022 15:20:49 +0100
Subject: [PATCH] Rename packages

---
 org.argeo.app.api/pom.xml                      |  5 +++++
 .../{entity => app/api}/EntityConstants.java   |  2 +-
 .../{entity => app/api}/EntityDefinition.java  |  2 +-
 .../{entity => app/api}/EntityMimeType.java    |  2 +-
 .../argeo/{entity => app/api}/EntityNames.java |  2 +-
 .../argeo/{entity => app/api}/EntityType.java  |  2 +-
 .../argeo/{entity => app/api}/EntityTypes.java |  2 +-
 .../org/argeo/{entity => app/api}/JcrName.java |  2 +-
 .../src/org/argeo/app/api}/RankedObject.java   |  2 +-
 .../src/org/argeo/app/api}/RankingKey.java     |  2 +-
 .../src/org/argeo/app/api}/SuiteRole.java      |  2 +-
 .../org/argeo/{entity => app/api}/Term.java    |  2 +-
 .../{entity => app/api}/TermsManager.java      |  2 +-
 .../argeo/{entity => app/api}/Typology.java    |  2 +-
 .../org/argeo/{entity => app/api}/entity.cnd   |  0
 .../OSGI-INF/maintenanceService.xml            |  2 +-
 org.argeo.app.core/OSGI-INF/termsManager.xml   |  4 ++--
 org.argeo.app.core/bnd.bnd                     |  1 -
 .../core/CustomMaintenanceService.java         |  4 ++--
 .../core/JcrEntityDefinition.java              |  6 +++---
 .../core/SuiteMaintenanceService.java          |  4 ++--
 .../argeo/{suite => app}/core/SuiteTerm.java   |  4 ++--
 .../{suite => app}/core/SuiteTermsManager.java | 10 +++++-----
 .../{suite => app}/core/SuiteTypology.java     |  6 +++---
 .../argeo/{suite => app/core}/SuiteUtils.java  |  7 ++++---
 .../{suite/util => app/core}/XPathUtils.java   |  2 +-
 .../argeo/{ => app}/docbook/Dbk4Converter.java |  2 +-
 .../org/argeo/{ => app}/docbook/DbkAttr.java   |  2 +-
 .../org/argeo/{ => app}/docbook/DbkMsg.java    |  2 +-
 .../org/argeo/{ => app}/docbook/DbkType.java   |  4 ++--
 .../org/argeo/{ => app}/docbook/DbkUtils.java  |  6 +++---
 .../argeo/{ => app}/docbook/db4-upgrade.xsl    |  0
 .../argeo/{ => app}/docbook/docbook-full.cnd   |  0
 .../org/argeo/{ => app}/docbook/docbook.cnd    |  0
 .../org/argeo/{ => app}/geo/GeoJsonUtils.java  |  2 +-
 .../src/org/argeo/{ => app}/geo/GeoToSvg.java  |  2 +-
 .../geo}/geonames/GeonamesAdm.java             |  2 +-
 .../geo}/geonames/ImportGeonamesAdmin.java     |  2 +-
 .../{suite => app}/library/DocxExtractor.java  |  2 +-
 .../odk/BundleResourceOdkForm.java             |  2 +-
 .../argeo/{support => app}/odk/OdkForm.java    |  2 +-
 .../argeo/{support => app}/odk/OdkNames.java   |  2 +-
 .../argeo/{support => app}/odk/OdkUtils.java   |  6 +++---
 .../{support => app}/odk/OrxListName.java      |  4 ++--
 .../{support => app}/odk/OrxManifestName.java  |  4 ++--
 .../argeo/{support => app}/odk/OrxType.java    |  4 ++--
 .../src/org/argeo/{support => app}/odk/odk.cnd |  0
 .../xforms/FormSubmissionListener.java         |  2 +-
 .../argeo/{support => app}/xforms/xforms.cnd   |  0
 .../OSGI-INF/odkFormListServlet.xml            |  4 ++--
 .../OSGI-INF/odkFormServlet.xml                |  4 ++--
 .../OSGI-INF/odkManifestServlet.xml            |  2 +-
 .../OSGI-INF/odkServletContext.xml             |  2 +-
 .../OSGI-INF/odkSubmissionServlet.xml          |  4 ++--
 .../servlet/odk}/OdkFormListServlet.java       | 10 +++++-----
 .../servlet/odk}/OdkFormServlet.java           |  6 +++---
 .../servlet/odk}/OdkManifestServlet.java       |  6 +++---
 .../servlet/odk}/OdkServletContext.java        |  2 +-
 .../servlet/odk}/OdkSubmissionServlet.java     |  8 ++++----
 .../OSGI-INF/dbk4Converter.xml                 |  4 ++--
 .../OSGI-INF/dbkServlet.xml                    |  2 +-
 .../OSGI-INF/documentUiProvider.xml            |  2 +-
 .../OSGI-INF/fontsServlet.xml                  |  2 +-
 .../OSGI-INF/wwwLayer.xml                      |  4 ++--
 org.argeo.app.servlet.publish/bnd.bnd          |  3 +--
 .../servlet/publish}/DbkServlet.java           |  6 +++---
 .../servlet/publish}/FontsServlet.java         |  2 +-
 org.argeo.app.ui/OSGI-INF/adminLeadPane.xml    |  4 ++--
 org.argeo.app.ui/OSGI-INF/cmsApp.xml           |  4 ++--
 org.argeo.app.ui/OSGI-INF/dashboard.xml        |  2 +-
 org.argeo.app.ui/OSGI-INF/dashboardLayer.xml   |  4 ++--
 org.argeo.app.ui/OSGI-INF/eventRecorder.xml    |  2 +-
 org.argeo.app.ui/OSGI-INF/footer.xml           |  2 +-
 org.argeo.app.ui/OSGI-INF/header.xml           |  2 +-
 org.argeo.app.ui/OSGI-INF/leadPane.xml         |  4 ++--
 org.argeo.app.ui/OSGI-INF/loginScreen.xml      |  2 +-
 org.argeo.app.ui/OSGI-INF/recentItems.xml      |  2 +-
 org.argeo.app.ui/OSGI-INF/termsEntryArea.xml   |  2 +-
 org.argeo.app.ui/OSGI-INF/termsLayer.xml       |  4 ++--
 org.argeo.app.ui/bnd.bnd                       |  1 -
 org.argeo.app.ui/pom.xml                       |  2 +-
 .../{suite => app}/ui/DefaultDashboard.java    |  2 +-
 .../{suite => app}/ui/DefaultEditionLayer.java |  4 ++--
 .../argeo/{suite => app}/ui/DefaultFooter.java |  2 +-
 .../argeo/{suite => app}/ui/DefaultHeader.java |  2 +-
 .../{suite => app}/ui/DefaultLeadPane.java     |  6 +++---
 .../{suite => app}/ui/DefaultLoginScreen.java  |  2 +-
 .../argeo/{suite => app}/ui/EventRecorder.java |  2 +-
 .../argeo/{suite => app}/ui/RecentItems.java   |  8 ++++----
 .../org/argeo/{suite => app}/ui/SuiteApp.java  | 12 ++++++------
 .../argeo/{suite => app}/ui/SuiteEvent.java    |  2 +-
 .../org/argeo/{suite => app}/ui/SuiteIcon.java |  2 +-
 .../argeo/{suite => app}/ui/SuiteLayer.java    |  2 +-
 .../org/argeo/{suite => app}/ui/SuiteMsg.java  |  2 +-
 .../argeo/{suite => app}/ui/SuiteStyle.java    |  2 +-
 .../org/argeo/{suite => app}/ui/SuiteUi.java   |  2 +-
 .../argeo/{suite => app}/ui/SuiteUiUtils.java  |  8 ++++----
 .../{suite => app}/ui/TermsEntryArea.java      |  2 +-
 .../ui/dialogs/NewPersonPage.java              |  6 +++---
 .../ui/dialogs/NewPersonWizard.java            |  6 +++---
 .../ui/dialogs/NewUserWizard.java              |  6 +++---
 .../ui/docbook}/AbstractDbkViewer.java         | 14 +++++++-------
 .../ui => app/ui/docbook}/CustomDbkEditor.java |  2 +-
 .../ui => app/ui/docbook}/DbkContextMenu.java  |  6 +++---
 .../ui => app/ui/docbook}/DbkImageManager.java | 12 ++++++------
 .../{docbook/ui => app/ui/docbook}/DbkImg.java |  2 +-
 .../ui => app/ui/docbook}/DbkSectionTitle.java |  2 +-
 .../ui/docbook}/DbkTextInterpreter.java        | 12 ++++++------
 .../ui => app/ui/docbook}/DbkVideo.java        |  8 ++++----
 .../ui => app/ui/docbook}/DocumentPage.java    |  4 ++--
 .../ui/docbook}/DocumentTextEditor.java        |  6 +++---
 .../ui => app/ui/docbook}/Paragraph.java       |  4 ++--
 .../ui/docbook}/TextEditorHeader.java          |  2 +-
 .../ui => app/ui/docbook}/TextInterpreter.java |  2 +-
 .../ui => app/ui/docbook}/TextSection.java     |  4 ++--
 .../ui/forms/AbstractTermsPart.java            |  8 ++++----
 .../ui/forms/MultiTermsPart.java               |  6 +++---
 .../ui/forms/SingleTermPart.java               |  6 +++---
 .../ui/library}/ContentEntryArea.java          | 10 +++++-----
 .../ui/library}/DocumentsContextMenu.java      | 18 +++++++++---------
 .../ui/library}/DocumentsFileComposite.java    |  2 +-
 .../ui/library}/DocumentsFolderComposite.java  |  2 +-
 .../ui/library}/DocumentsFolderUiProvider.java |  4 ++--
 .../ui/library}/DocumentsTreeUiProvider.java   |  4 ++--
 .../ui/library}/DocumentsUiService.java        |  2 +-
 .../{support => app/ui}/openlayers/OLMap.java  |  2 +-
 .../ui}/openlayers/OpenLayersMap.java          |  8 ++++----
 .../ui}/openlayers/OverviewMap.java            |  4 ++--
 .../ui}/openlayers/map-osm.html                |  0
 .../{support => app/ui}/openlayers/map.js      |  0
 .../ui => app/ui/people}/PeopleEntryArea.java  | 10 +++++-----
 .../ui => app/ui/people}/PersonUiProvider.java |  6 +++---
 .../ui/people}/SuiteUserUiProvider.java        |  6 +++---
 .../ui/people}/SuiteUsersEntryArea.java        | 10 +++++-----
 .../ui/publish}/DocumentUiProvider.java        |  8 ++++----
 .../ui => app/ui/publish}/PublishingApp.java   |  8 ++++----
 .../ui => app/ui/publish}/PublishingStyle.java |  2 +-
 .../ui/widgets/AbstractConnectContextMenu.java |  2 +-
 .../ui/widgets/ConnectAbstractDropDown.java    |  2 +-
 .../{suite => app}/ui/widgets/DelayedText.java |  2 +-
 .../{suite => app}/ui/widgets/TabbedArea.java  |  2 +-
 .../ui/widgets/TreeOrSearchArea.java           |  2 +-
 142 files changed, 271 insertions(+), 268 deletions(-)
 rename org.argeo.app.api/src/org/argeo/{entity => app/api}/EntityConstants.java (89%)
 rename org.argeo.app.api/src/org/argeo/{entity => app/api}/EntityDefinition.java (87%)
 rename org.argeo.app.api/src/org/argeo/{entity => app/api}/EntityMimeType.java (97%)
 rename org.argeo.app.api/src/org/argeo/{entity => app/api}/EntityNames.java (98%)
 rename org.argeo.app.api/src/org/argeo/{entity => app/api}/EntityType.java (95%)
 rename org.argeo.app.api/src/org/argeo/{entity => app/api}/EntityTypes.java (90%)
 rename org.argeo.app.api/src/org/argeo/{entity => app/api}/JcrName.java (96%)
 rename {org.argeo.app.core/src/org/argeo/suite => org.argeo.app.api/src/org/argeo/app/api}/RankedObject.java (98%)
 rename {org.argeo.app.core/src/org/argeo/suite => org.argeo.app.api/src/org/argeo/app/api}/RankingKey.java (99%)
 rename {org.argeo.app.core/src/org/argeo/suite => org.argeo.app.api/src/org/argeo/app/api}/SuiteRole.java (94%)
 rename org.argeo.app.api/src/org/argeo/{entity => app/api}/Term.java (92%)
 rename org.argeo.app.api/src/org/argeo/{entity => app/api}/TermsManager.java (90%)
 rename org.argeo.app.api/src/org/argeo/{entity => app/api}/Typology.java (89%)
 rename org.argeo.app.api/src/org/argeo/{entity => app/api}/entity.cnd (100%)
 rename org.argeo.app.core/src/org/argeo/{suite => app}/core/CustomMaintenanceService.java (97%)
 rename org.argeo.app.core/src/org/argeo/{entity => app}/core/JcrEntityDefinition.java (94%)
 rename org.argeo.app.core/src/org/argeo/{suite => app}/core/SuiteMaintenanceService.java (94%)
 rename org.argeo.app.core/src/org/argeo/{suite => app}/core/SuiteTerm.java (95%)
 rename org.argeo.app.core/src/org/argeo/{suite => app}/core/SuiteTermsManager.java (94%)
 rename org.argeo.app.core/src/org/argeo/{suite => app}/core/SuiteTypology.java (95%)
 rename org.argeo.app.core/src/org/argeo/{suite => app/core}/SuiteUtils.java (97%)
 rename org.argeo.app.core/src/org/argeo/{suite/util => app/core}/XPathUtils.java (99%)
 rename org.argeo.app.core/src/org/argeo/{ => app}/docbook/Dbk4Converter.java (99%)
 rename org.argeo.app.core/src/org/argeo/{ => app}/docbook/DbkAttr.java (84%)
 rename org.argeo.app.core/src/org/argeo/{ => app}/docbook/DbkMsg.java (88%)
 rename org.argeo.app.core/src/org/argeo/{ => app}/docbook/DbkType.java (88%)
 rename org.argeo.app.core/src/org/argeo/{ => app}/docbook/DbkUtils.java (98%)
 rename org.argeo.app.core/src/org/argeo/{ => app}/docbook/db4-upgrade.xsl (100%)
 rename org.argeo.app.core/src/org/argeo/{ => app}/docbook/docbook-full.cnd (100%)
 rename org.argeo.app.core/src/org/argeo/{ => app}/docbook/docbook.cnd (100%)
 rename org.argeo.app.core/src/org/argeo/{ => app}/geo/GeoJsonUtils.java (95%)
 rename org.argeo.app.core/src/org/argeo/{ => app}/geo/GeoToSvg.java (98%)
 rename org.argeo.app.core/src/org/argeo/{support => app/geo}/geonames/GeonamesAdm.java (98%)
 rename org.argeo.app.core/src/org/argeo/{support => app/geo}/geonames/ImportGeonamesAdmin.java (98%)
 rename org.argeo.app.core/src/org/argeo/{suite => app}/library/DocxExtractor.java (99%)
 rename org.argeo.app.core/src/org/argeo/{support => app}/odk/BundleResourceOdkForm.java (98%)
 rename org.argeo.app.core/src/org/argeo/{support => app}/odk/OdkForm.java (89%)
 rename org.argeo.app.core/src/org/argeo/{support => app}/odk/OdkNames.java (77%)
 rename org.argeo.app.core/src/org/argeo/{support => app}/odk/OdkUtils.java (98%)
 rename org.argeo.app.core/src/org/argeo/{support => app}/odk/OrxListName.java (87%)
 rename org.argeo.app.core/src/org/argeo/{support => app}/odk/OrxManifestName.java (87%)
 rename org.argeo.app.core/src/org/argeo/{support => app}/odk/OrxType.java (86%)
 rename org.argeo.app.core/src/org/argeo/{support => app}/odk/odk.cnd (100%)
 rename org.argeo.app.core/src/org/argeo/{support => app}/xforms/FormSubmissionListener.java (90%)
 rename org.argeo.app.core/src/org/argeo/{support => app}/xforms/xforms.cnd (100%)
 rename org.argeo.app.servlet.odk/src/org/argeo/{support/odk/servlet => app/servlet/odk}/OdkFormListServlet.java (96%)
 rename org.argeo.app.servlet.odk/src/org/argeo/{support/odk/servlet => app/servlet/odk}/OdkFormServlet.java (95%)
 rename org.argeo.app.servlet.odk/src/org/argeo/{support/odk/servlet => app/servlet/odk}/OdkManifestServlet.java (98%)
 rename org.argeo.app.servlet.odk/src/org/argeo/{support/odk/servlet => app/servlet/odk}/OdkServletContext.java (93%)
 rename org.argeo.app.servlet.odk/src/org/argeo/{support/odk/servlet => app/servlet/odk}/OdkSubmissionServlet.java (96%)
 rename org.argeo.app.servlet.publish/src/org/argeo/{publishing/servlet => app/servlet/publish}/DbkServlet.java (98%)
 rename org.argeo.app.servlet.publish/src/org/argeo/{publishing/servlet => app/servlet/publish}/FontsServlet.java (97%)
 rename org.argeo.app.ui/src/org/argeo/{suite => app}/ui/DefaultDashboard.java (96%)
 rename org.argeo.app.ui/src/org/argeo/{suite => app}/ui/DefaultEditionLayer.java (99%)
 rename org.argeo.app.ui/src/org/argeo/{suite => app}/ui/DefaultFooter.java (97%)
 rename org.argeo.app.ui/src/org/argeo/{suite => app}/ui/DefaultHeader.java (99%)
 rename org.argeo.app.ui/src/org/argeo/{suite => app}/ui/DefaultLeadPane.java (98%)
 rename org.argeo.app.ui/src/org/argeo/{suite => app}/ui/DefaultLoginScreen.java (97%)
 rename org.argeo.app.ui/src/org/argeo/{suite => app}/ui/EventRecorder.java (93%)
 rename org.argeo.app.ui/src/org/argeo/{suite => app}/ui/RecentItems.java (98%)
 rename org.argeo.app.ui/src/org/argeo/{suite => app}/ui/SuiteApp.java (98%)
 rename org.argeo.app.ui/src/org/argeo/{suite => app}/ui/SuiteEvent.java (97%)
 rename org.argeo.app.ui/src/org/argeo/{suite => app}/ui/SuiteIcon.java (92%)
 rename org.argeo.app.ui/src/org/argeo/{suite => app}/ui/SuiteLayer.java (95%)
 rename org.argeo.app.ui/src/org/argeo/{suite => app}/ui/SuiteMsg.java (97%)
 rename org.argeo.app.ui/src/org/argeo/{suite => app}/ui/SuiteStyle.java (96%)
 rename org.argeo.app.ui/src/org/argeo/{suite => app}/ui/SuiteUi.java (99%)
 rename org.argeo.app.ui/src/org/argeo/{suite => app}/ui/SuiteUiUtils.java (99%)
 rename org.argeo.app.ui/src/org/argeo/{suite => app}/ui/TermsEntryArea.java (95%)
 rename org.argeo.app.ui/src/org/argeo/{suite => app}/ui/dialogs/NewPersonPage.java (95%)
 rename org.argeo.app.ui/src/org/argeo/{suite => app}/ui/dialogs/NewPersonWizard.java (97%)
 rename org.argeo.app.ui/src/org/argeo/{suite => app}/ui/dialogs/NewUserWizard.java (97%)
 rename org.argeo.app.ui/src/org/argeo/{docbook/ui => app/ui/docbook}/AbstractDbkViewer.java (99%)
 rename org.argeo.app.ui/src/org/argeo/{docbook/ui => app/ui/docbook}/CustomDbkEditor.java (95%)
 rename org.argeo.app.ui/src/org/argeo/{docbook/ui => app/ui/docbook}/DbkContextMenu.java (98%)
 rename org.argeo.app.ui/src/org/argeo/{docbook/ui => app/ui/docbook}/DbkImageManager.java (96%)
 rename org.argeo.app.ui/src/org/argeo/{docbook/ui => app/ui/docbook}/DbkImg.java (98%)
 rename org.argeo.app.ui/src/org/argeo/{docbook/ui => app/ui/docbook}/DbkSectionTitle.java (96%)
 rename org.argeo.app.ui/src/org/argeo/{docbook/ui => app/ui/docbook}/DbkTextInterpreter.java (97%)
 rename org.argeo.app.ui/src/org/argeo/{docbook/ui => app/ui/docbook}/DbkVideo.java (97%)
 rename org.argeo.app.ui/src/org/argeo/{docbook/ui => app/ui/docbook}/DocumentPage.java (96%)
 rename org.argeo.app.ui/src/org/argeo/{docbook/ui => app/ui/docbook}/DocumentTextEditor.java (90%)
 rename org.argeo.app.ui/src/org/argeo/{docbook/ui => app/ui/docbook}/Paragraph.java (94%)
 rename org.argeo.app.ui/src/org/argeo/{docbook/ui => app/ui/docbook}/TextEditorHeader.java (98%)
 rename org.argeo.app.ui/src/org/argeo/{docbook/ui => app/ui/docbook}/TextInterpreter.java (88%)
 rename org.argeo.app.ui/src/org/argeo/{docbook/ui => app/ui/docbook}/TextSection.java (96%)
 rename org.argeo.app.ui/src/org/argeo/{entity => app}/ui/forms/AbstractTermsPart.java (96%)
 rename org.argeo.app.ui/src/org/argeo/{entity => app}/ui/forms/MultiTermsPart.java (98%)
 rename org.argeo.app.ui/src/org/argeo/{entity => app}/ui/forms/SingleTermPart.java (97%)
 rename org.argeo.app.ui/src/org/argeo/{library/ui => app/ui/library}/ContentEntryArea.java (96%)
 rename org.argeo.app.ui/src/org/argeo/{library/ui => app/ui/library}/DocumentsContextMenu.java (89%)
 rename org.argeo.app.ui/src/org/argeo/{library/ui => app/ui/library}/DocumentsFileComposite.java (99%)
 rename org.argeo.app.ui/src/org/argeo/{library/ui => app/ui/library}/DocumentsFolderComposite.java (99%)
 rename org.argeo.app.ui/src/org/argeo/{library/ui => app/ui/library}/DocumentsFolderUiProvider.java (95%)
 rename org.argeo.app.ui/src/org/argeo/{library/ui => app/ui/library}/DocumentsTreeUiProvider.java (97%)
 rename org.argeo.app.ui/src/org/argeo/{library/ui => app/ui/library}/DocumentsUiService.java (99%)
 rename org.argeo.app.ui/src/org/argeo/{support => app/ui}/openlayers/OLMap.java (93%)
 rename org.argeo.app.ui/src/org/argeo/{support => app/ui}/openlayers/OpenLayersMap.java (98%)
 rename org.argeo.app.ui/src/org/argeo/{support => app/ui}/openlayers/OverviewMap.java (96%)
 rename org.argeo.app.ui/src/org/argeo/{support => app/ui}/openlayers/map-osm.html (100%)
 rename org.argeo.app.ui/src/org/argeo/{support => app/ui}/openlayers/map.js (100%)
 rename org.argeo.app.ui/src/org/argeo/{people/ui => app/ui/people}/PeopleEntryArea.java (96%)
 rename org.argeo.app.ui/src/org/argeo/{people/ui => app/ui/people}/PersonUiProvider.java (96%)
 rename org.argeo.app.ui/src/org/argeo/{people/ui => app/ui/people}/SuiteUserUiProvider.java (96%)
 rename org.argeo.app.ui/src/org/argeo/{people/ui => app/ui/people}/SuiteUsersEntryArea.java (96%)
 rename org.argeo.app.ui/src/org/argeo/{publishing/ui => app/ui/publish}/DocumentUiProvider.java (91%)
 rename org.argeo.app.ui/src/org/argeo/{publishing/ui => app/ui/publish}/PublishingApp.java (94%)
 rename org.argeo.app.ui/src/org/argeo/{publishing/ui => app/ui/publish}/PublishingStyle.java (92%)
 rename org.argeo.app.ui/src/org/argeo/{suite => app}/ui/widgets/AbstractConnectContextMenu.java (99%)
 rename org.argeo.app.ui/src/org/argeo/{suite => app}/ui/widgets/ConnectAbstractDropDown.java (99%)
 rename org.argeo.app.ui/src/org/argeo/{suite => app}/ui/widgets/DelayedText.java (98%)
 rename org.argeo.app.ui/src/org/argeo/{suite => app}/ui/widgets/TabbedArea.java (99%)
 rename org.argeo.app.ui/src/org/argeo/{suite => app}/ui/widgets/TreeOrSearchArea.java (98%)

diff --git a/org.argeo.app.api/pom.xml b/org.argeo.app.api/pom.xml
index 4bd6bcf..7c7f588 100644
--- a/org.argeo.app.api/pom.xml
+++ b/org.argeo.app.api/pom.xml
@@ -12,6 +12,11 @@
 	<packaging>jar</packaging>
 	<dependencies>
 		<!-- Argeo Commons -->
+		<dependency>
+			<groupId>org.argeo.commons</groupId>
+			<artifactId>org.argeo.api</artifactId>
+			<version>${version.argeo-commons}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.argeo.commons</groupId>
 			<artifactId>org.argeo.util</artifactId>
diff --git a/org.argeo.app.api/src/org/argeo/entity/EntityConstants.java b/org.argeo.app.api/src/org/argeo/app/api/EntityConstants.java
similarity index 89%
rename from org.argeo.app.api/src/org/argeo/entity/EntityConstants.java
rename to org.argeo.app.api/src/org/argeo/app/api/EntityConstants.java
index 93021e0..c7885be 100644
--- a/org.argeo.app.api/src/org/argeo/entity/EntityConstants.java
+++ b/org.argeo.app.api/src/org/argeo/app/api/EntityConstants.java
@@ -1,4 +1,4 @@
-package org.argeo.entity;
+package org.argeo.app.api;
 
 /** Constant related to entities, typically used in an OSGi context. */
 public interface EntityConstants {
diff --git a/org.argeo.app.api/src/org/argeo/entity/EntityDefinition.java b/org.argeo.app.api/src/org/argeo/app/api/EntityDefinition.java
similarity index 87%
rename from org.argeo.app.api/src/org/argeo/entity/EntityDefinition.java
rename to org.argeo.app.api/src/org/argeo/app/api/EntityDefinition.java
index 08aff61..e1280cf 100644
--- a/org.argeo.app.api/src/org/argeo/entity/EntityDefinition.java
+++ b/org.argeo.app.api/src/org/argeo/app/api/EntityDefinition.java
@@ -1,4 +1,4 @@
-package org.argeo.entity;
+package org.argeo.app.api;
 
 import javax.jcr.Node;
 
diff --git a/org.argeo.app.api/src/org/argeo/entity/EntityMimeType.java b/org.argeo.app.api/src/org/argeo/app/api/EntityMimeType.java
similarity index 97%
rename from org.argeo.app.api/src/org/argeo/entity/EntityMimeType.java
rename to org.argeo.app.api/src/org/argeo/app/api/EntityMimeType.java
index 997f1be..eaefcd0 100644
--- a/org.argeo.app.api/src/org/argeo/entity/EntityMimeType.java
+++ b/org.argeo.app.api/src/org/argeo/app/api/EntityMimeType.java
@@ -1,4 +1,4 @@
-package org.argeo.entity;
+package org.argeo.app.api;
 
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
diff --git a/org.argeo.app.api/src/org/argeo/entity/EntityNames.java b/org.argeo.app.api/src/org/argeo/app/api/EntityNames.java
similarity index 98%
rename from org.argeo.app.api/src/org/argeo/entity/EntityNames.java
rename to org.argeo.app.api/src/org/argeo/app/api/EntityNames.java
index 57901c4..7776056 100644
--- a/org.argeo.app.api/src/org/argeo/entity/EntityNames.java
+++ b/org.argeo.app.api/src/org/argeo/app/api/EntityNames.java
@@ -1,4 +1,4 @@
-package org.argeo.entity;
+package org.argeo.app.api;
 
 import org.argeo.util.naming.LdapAttrs;
 
diff --git a/org.argeo.app.api/src/org/argeo/entity/EntityType.java b/org.argeo.app.api/src/org/argeo/app/api/EntityType.java
similarity index 95%
rename from org.argeo.app.api/src/org/argeo/entity/EntityType.java
rename to org.argeo.app.api/src/org/argeo/app/api/EntityType.java
index 089cdcf..48b1266 100644
--- a/org.argeo.app.api/src/org/argeo/entity/EntityType.java
+++ b/org.argeo.app.api/src/org/argeo/app/api/EntityType.java
@@ -1,4 +1,4 @@
-package org.argeo.entity;
+package org.argeo.app.api;
 
 /** Types related to entities. */
 public enum EntityType implements JcrName {
diff --git a/org.argeo.app.api/src/org/argeo/entity/EntityTypes.java b/org.argeo.app.api/src/org/argeo/app/api/EntityTypes.java
similarity index 90%
rename from org.argeo.app.api/src/org/argeo/entity/EntityTypes.java
rename to org.argeo.app.api/src/org/argeo/app/api/EntityTypes.java
index ef35147..f320794 100644
--- a/org.argeo.app.api/src/org/argeo/entity/EntityTypes.java
+++ b/org.argeo.app.api/src/org/argeo/app/api/EntityTypes.java
@@ -1,4 +1,4 @@
-package org.argeo.entity;
+package org.argeo.app.api;
 
 /** Types related to entities. */
 @Deprecated
diff --git a/org.argeo.app.api/src/org/argeo/entity/JcrName.java b/org.argeo.app.api/src/org/argeo/app/api/JcrName.java
similarity index 96%
rename from org.argeo.app.api/src/org/argeo/entity/JcrName.java
rename to org.argeo.app.api/src/org/argeo/app/api/JcrName.java
index 322c42e..182494a 100644
--- a/org.argeo.app.api/src/org/argeo/entity/JcrName.java
+++ b/org.argeo.app.api/src/org/argeo/app/api/JcrName.java
@@ -1,4 +1,4 @@
-package org.argeo.entity;
+package org.argeo.app.api;
 
 import java.util.function.Supplier;
 
diff --git a/org.argeo.app.core/src/org/argeo/suite/RankedObject.java b/org.argeo.app.api/src/org/argeo/app/api/RankedObject.java
similarity index 98%
rename from org.argeo.app.core/src/org/argeo/suite/RankedObject.java
rename to org.argeo.app.api/src/org/argeo/app/api/RankedObject.java
index b3ba37d..31c43a7 100644
--- a/org.argeo.app.core/src/org/argeo/suite/RankedObject.java
+++ b/org.argeo.app.api/src/org/argeo/app/api/RankedObject.java
@@ -1,4 +1,4 @@
-package org.argeo.suite;
+package org.argeo.app.api;
 
 import java.util.Map;
 
diff --git a/org.argeo.app.core/src/org/argeo/suite/RankingKey.java b/org.argeo.app.api/src/org/argeo/app/api/RankingKey.java
similarity index 99%
rename from org.argeo.app.core/src/org/argeo/suite/RankingKey.java
rename to org.argeo.app.api/src/org/argeo/app/api/RankingKey.java
index e099195..691570c 100644
--- a/org.argeo.app.core/src/org/argeo/suite/RankingKey.java
+++ b/org.argeo.app.api/src/org/argeo/app/api/RankingKey.java
@@ -1,4 +1,4 @@
-package org.argeo.suite;
+package org.argeo.app.api;
 
 import java.util.Map;
 
diff --git a/org.argeo.app.core/src/org/argeo/suite/SuiteRole.java b/org.argeo.app.api/src/org/argeo/app/api/SuiteRole.java
similarity index 94%
rename from org.argeo.app.core/src/org/argeo/suite/SuiteRole.java
rename to org.argeo.app.api/src/org/argeo/app/api/SuiteRole.java
index 7f3af76..38ce11f 100644
--- a/org.argeo.app.core/src/org/argeo/suite/SuiteRole.java
+++ b/org.argeo.app.api/src/org/argeo/app/api/SuiteRole.java
@@ -1,4 +1,4 @@
-package org.argeo.suite;
+package org.argeo.app.api;
 
 import org.argeo.api.cms.CmsConstants;
 import org.argeo.util.naming.Distinguished;
diff --git a/org.argeo.app.api/src/org/argeo/entity/Term.java b/org.argeo.app.api/src/org/argeo/app/api/Term.java
similarity index 92%
rename from org.argeo.app.api/src/org/argeo/entity/Term.java
rename to org.argeo.app.api/src/org/argeo/app/api/Term.java
index 3bf075a..5a7f09e 100644
--- a/org.argeo.app.api/src/org/argeo/entity/Term.java
+++ b/org.argeo.app.api/src/org/argeo/app/api/Term.java
@@ -1,4 +1,4 @@
-package org.argeo.entity;
+package org.argeo.app.api;
 
 import java.util.List;
 
diff --git a/org.argeo.app.api/src/org/argeo/entity/TermsManager.java b/org.argeo.app.api/src/org/argeo/app/api/TermsManager.java
similarity index 90%
rename from org.argeo.app.api/src/org/argeo/entity/TermsManager.java
rename to org.argeo.app.api/src/org/argeo/app/api/TermsManager.java
index 7564ff9..decddd9 100644
--- a/org.argeo.app.api/src/org/argeo/entity/TermsManager.java
+++ b/org.argeo.app.api/src/org/argeo/app/api/TermsManager.java
@@ -1,4 +1,4 @@
-package org.argeo.entity;
+package org.argeo.app.api;
 
 import java.util.List;
 
diff --git a/org.argeo.app.api/src/org/argeo/entity/Typology.java b/org.argeo.app.api/src/org/argeo/app/api/Typology.java
similarity index 89%
rename from org.argeo.app.api/src/org/argeo/entity/Typology.java
rename to org.argeo.app.api/src/org/argeo/app/api/Typology.java
index 5be27e3..f57e692 100644
--- a/org.argeo.app.api/src/org/argeo/entity/Typology.java
+++ b/org.argeo.app.api/src/org/argeo/app/api/Typology.java
@@ -1,4 +1,4 @@
-package org.argeo.entity;
+package org.argeo.app.api;
 
 import java.util.List;
 
diff --git a/org.argeo.app.api/src/org/argeo/entity/entity.cnd b/org.argeo.app.api/src/org/argeo/app/api/entity.cnd
similarity index 100%
rename from org.argeo.app.api/src/org/argeo/entity/entity.cnd
rename to org.argeo.app.api/src/org/argeo/app/api/entity.cnd
diff --git a/org.argeo.app.core/OSGI-INF/maintenanceService.xml b/org.argeo.app.core/OSGI-INF/maintenanceService.xml
index 2d495c8..48a982f 100644
--- a/org.argeo.app.core/OSGI-INF/maintenanceService.xml
+++ b/org.argeo.app.core/OSGI-INF/maintenanceService.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="init" deactivate="destroy" name="Suite Maintenance Service">
-   <implementation class="org.argeo.suite.core.SuiteMaintenanceService"/>
+   <implementation class="org.argeo.app.core.SuiteMaintenanceService"/>
    <reference bind="setRepository" cardinality="1..1" interface="javax.jcr.Repository" name="Repository" policy="static" target="(cn=entity)"/>
    <reference bind="setUserTransaction" cardinality="1..1" interface="javax.transaction.UserTransaction" name="UserTransaction" policy="static"/>
    <reference bind="setUserAdmin" cardinality="1..1" interface="org.osgi.service.useradmin.UserAdmin" name="UserAdmin" policy="static"/>
diff --git a/org.argeo.app.core/OSGI-INF/termsManager.xml b/org.argeo.app.core/OSGI-INF/termsManager.xml
index 3e6d4c6..92f84c6 100644
--- a/org.argeo.app.core/OSGI-INF/termsManager.xml
+++ b/org.argeo.app.core/OSGI-INF/termsManager.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" activate="init" deactivate="destroy" name="Suite Terms Manager">
-   <implementation class="org.argeo.suite.core.SuiteTermsManager"/>
+   <implementation class="org.argeo.app.core.SuiteTermsManager"/>
    <reference bind="setRepository" cardinality="1..1" interface="javax.jcr.Repository" name="Repository" policy="static" target="(cn=entity)"/>
    <service>
-      <provide interface="org.argeo.entity.TermsManager"/>
+      <provide interface="org.argeo.app.api.TermsManager"/>
    </service>
 </scr:component>
diff --git a/org.argeo.app.core/bnd.bnd b/org.argeo.app.core/bnd.bnd
index fc27132..f7a9e0d 100644
--- a/org.argeo.app.core/bnd.bnd
+++ b/org.argeo.app.core/bnd.bnd
@@ -10,5 +10,4 @@ org.osgi.service.useradmin,\
 javax.jcr.nodetype,\
 javax.jcr.security,\
 com.fasterxml.jackson.core,\
-org.argeo.entity,\
 *
\ No newline at end of file
diff --git a/org.argeo.app.core/src/org/argeo/suite/core/CustomMaintenanceService.java b/org.argeo.app.core/src/org/argeo/app/core/CustomMaintenanceService.java
similarity index 97%
rename from org.argeo.app.core/src/org/argeo/suite/core/CustomMaintenanceService.java
rename to org.argeo.app.core/src/org/argeo/app/core/CustomMaintenanceService.java
index 4cd05cf..4b69883 100644
--- a/org.argeo.app.core/src/org/argeo/suite/core/CustomMaintenanceService.java
+++ b/org.argeo.app.core/src/org/argeo/app/core/CustomMaintenanceService.java
@@ -1,4 +1,4 @@
-package org.argeo.suite.core;
+package org.argeo.app.core;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -12,7 +12,7 @@ import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
 import org.argeo.api.cms.CmsLog;
-import org.argeo.entity.EntityType;
+import org.argeo.app.api.EntityType;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.maintenance.AbstractMaintenanceService;
 
diff --git a/org.argeo.app.core/src/org/argeo/entity/core/JcrEntityDefinition.java b/org.argeo.app.core/src/org/argeo/app/core/JcrEntityDefinition.java
similarity index 94%
rename from org.argeo.app.core/src/org/argeo/entity/core/JcrEntityDefinition.java
rename to org.argeo.app.core/src/org/argeo/app/core/JcrEntityDefinition.java
index d6d1246..10c27a8 100644
--- a/org.argeo.app.core/src/org/argeo/entity/core/JcrEntityDefinition.java
+++ b/org.argeo.app.core/src/org/argeo/app/core/JcrEntityDefinition.java
@@ -1,4 +1,4 @@
-package org.argeo.entity.core;
+package org.argeo.app.core;
 
 import java.util.Map;
 
@@ -7,9 +7,9 @@ import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
+import org.argeo.app.api.EntityConstants;
+import org.argeo.app.api.EntityDefinition;
 import org.argeo.cms.jcr.CmsJcrUtils;
-import org.argeo.entity.EntityConstants;
-import org.argeo.entity.EntityDefinition;
 import org.argeo.jcr.Jcr;
 import org.osgi.framework.BundleContext;
 
diff --git a/org.argeo.app.core/src/org/argeo/suite/core/SuiteMaintenanceService.java b/org.argeo.app.core/src/org/argeo/app/core/SuiteMaintenanceService.java
similarity index 94%
rename from org.argeo.app.core/src/org/argeo/suite/core/SuiteMaintenanceService.java
rename to org.argeo.app.core/src/org/argeo/app/core/SuiteMaintenanceService.java
index ab2043f..532b7dd 100644
--- a/org.argeo.app.core/src/org/argeo/suite/core/SuiteMaintenanceService.java
+++ b/org.argeo.app.core/src/org/argeo/app/core/SuiteMaintenanceService.java
@@ -1,4 +1,4 @@
-package org.argeo.suite.core;
+package org.argeo.app.core;
 
 import java.io.IOException;
 
@@ -9,7 +9,7 @@ import javax.jcr.nodetype.NodeType;
 import javax.jcr.security.Privilege;
 
 import org.argeo.api.cms.CmsConstants;
-import org.argeo.entity.EntityType;
+import org.argeo.app.api.EntityType;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.maintenance.AbstractMaintenanceService;
 
diff --git a/org.argeo.app.core/src/org/argeo/suite/core/SuiteTerm.java b/org.argeo.app.core/src/org/argeo/app/core/SuiteTerm.java
similarity index 95%
rename from org.argeo.app.core/src/org/argeo/suite/core/SuiteTerm.java
rename to org.argeo.app.core/src/org/argeo/app/core/SuiteTerm.java
index 227b567..aef23b5 100644
--- a/org.argeo.app.core/src/org/argeo/suite/core/SuiteTerm.java
+++ b/org.argeo.app.core/src/org/argeo/app/core/SuiteTerm.java
@@ -1,9 +1,9 @@
-package org.argeo.suite.core;
+package org.argeo.app.core;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.argeo.entity.Term;
+import org.argeo.app.api.Term;
 
 /**
  * A single term. Helper to optimise {@link SuiteTermsManager} implementation.
diff --git a/org.argeo.app.core/src/org/argeo/suite/core/SuiteTermsManager.java b/org.argeo.app.core/src/org/argeo/app/core/SuiteTermsManager.java
similarity index 94%
rename from org.argeo.app.core/src/org/argeo/suite/core/SuiteTermsManager.java
rename to org.argeo.app.core/src/org/argeo/app/core/SuiteTermsManager.java
index 41126c3..c14f871 100644
--- a/org.argeo.app.core/src/org/argeo/suite/core/SuiteTermsManager.java
+++ b/org.argeo.app.core/src/org/argeo/app/core/SuiteTermsManager.java
@@ -1,4 +1,4 @@
-package org.argeo.suite.core;
+package org.argeo.app.core;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -11,11 +11,11 @@ import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
 import org.argeo.api.cms.CmsConstants;
+import org.argeo.app.api.EntityNames;
+import org.argeo.app.api.EntityType;
+import org.argeo.app.api.Term;
+import org.argeo.app.api.TermsManager;
 import org.argeo.cms.jcr.CmsJcrUtils;
-import org.argeo.entity.EntityNames;
-import org.argeo.entity.EntityType;
-import org.argeo.entity.Term;
-import org.argeo.entity.TermsManager;
 import org.argeo.jcr.Jcr;
 import org.argeo.jcr.JcrException;
 
diff --git a/org.argeo.app.core/src/org/argeo/suite/core/SuiteTypology.java b/org.argeo.app.core/src/org/argeo/app/core/SuiteTypology.java
similarity index 95%
rename from org.argeo.app.core/src/org/argeo/suite/core/SuiteTypology.java
rename to org.argeo.app.core/src/org/argeo/app/core/SuiteTypology.java
index d9d6673..7838274 100644
--- a/org.argeo.app.core/src/org/argeo/suite/core/SuiteTypology.java
+++ b/org.argeo.app.core/src/org/argeo/app/core/SuiteTypology.java
@@ -1,12 +1,12 @@
-package org.argeo.suite.core;
+package org.argeo.app.core;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import javax.jcr.Node;
 
-import org.argeo.entity.Term;
-import org.argeo.entity.Typology;
+import org.argeo.app.api.Term;
+import org.argeo.app.api.Typology;
 import org.argeo.jcr.Jcr;
 
 /** A typology. Helper to optimise {@link SuiteTermsManager} implementation. */
diff --git a/org.argeo.app.core/src/org/argeo/suite/SuiteUtils.java b/org.argeo.app.core/src/org/argeo/app/core/SuiteUtils.java
similarity index 97%
rename from org.argeo.app.core/src/org/argeo/suite/SuiteUtils.java
rename to org.argeo.app.core/src/org/argeo/app/core/SuiteUtils.java
index e6d4960..0a31b14 100644
--- a/org.argeo.app.core/src/org/argeo/suite/SuiteUtils.java
+++ b/org.argeo.app.core/src/org/argeo/app/core/SuiteUtils.java
@@ -1,4 +1,4 @@
-package org.argeo.suite;
+package org.argeo.app.core;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -11,9 +11,10 @@ import javax.jcr.security.Privilege;
 import javax.naming.ldap.LdapName;
 import javax.security.auth.x500.X500Principal;
 
-import org.argeo.api.cms.CmsSession;
 import org.argeo.api.cms.CmsConstants;
-import org.argeo.entity.EntityType;
+import org.argeo.api.cms.CmsSession;
+import org.argeo.app.api.EntityType;
+import org.argeo.app.api.SuiteRole;
 import org.argeo.jackrabbit.security.JackrabbitSecurityUtils;
 import org.argeo.jcr.JcrException;
 import org.argeo.jcr.JcrUtils;
diff --git a/org.argeo.app.core/src/org/argeo/suite/util/XPathUtils.java b/org.argeo.app.core/src/org/argeo/app/core/XPathUtils.java
similarity index 99%
rename from org.argeo.app.core/src/org/argeo/suite/util/XPathUtils.java
rename to org.argeo.app.core/src/org/argeo/app/core/XPathUtils.java
index df56d3f..f86445c 100644
--- a/org.argeo.app.core/src/org/argeo/suite/util/XPathUtils.java
+++ b/org.argeo.app.core/src/org/argeo/app/core/XPathUtils.java
@@ -1,4 +1,4 @@
-package org.argeo.suite.util;
+package org.argeo.app.core;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
diff --git a/org.argeo.app.core/src/org/argeo/docbook/Dbk4Converter.java b/org.argeo.app.core/src/org/argeo/app/docbook/Dbk4Converter.java
similarity index 99%
rename from org.argeo.app.core/src/org/argeo/docbook/Dbk4Converter.java
rename to org.argeo.app.core/src/org/argeo/app/docbook/Dbk4Converter.java
index 916dddd..d3957d9 100644
--- a/org.argeo.app.core/src/org/argeo/docbook/Dbk4Converter.java
+++ b/org.argeo.app.core/src/org/argeo/app/docbook/Dbk4Converter.java
@@ -1,4 +1,4 @@
-package org.argeo.docbook;
+package org.argeo.app.docbook;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/org.argeo.app.core/src/org/argeo/docbook/DbkAttr.java b/org.argeo.app.core/src/org/argeo/app/docbook/DbkAttr.java
similarity index 84%
rename from org.argeo.app.core/src/org/argeo/docbook/DbkAttr.java
rename to org.argeo.app.core/src/org/argeo/app/docbook/DbkAttr.java
index 84097e2..f6cf839 100644
--- a/org.argeo.app.core/src/org/argeo/docbook/DbkAttr.java
+++ b/org.argeo.app.core/src/org/argeo/app/docbook/DbkAttr.java
@@ -1,4 +1,4 @@
-package org.argeo.docbook;
+package org.argeo.app.docbook;
 
 /** Supported DocBook attributes. */
 public enum DbkAttr {
diff --git a/org.argeo.app.core/src/org/argeo/docbook/DbkMsg.java b/org.argeo.app.core/src/org/argeo/app/docbook/DbkMsg.java
similarity index 88%
rename from org.argeo.app.core/src/org/argeo/docbook/DbkMsg.java
rename to org.argeo.app.core/src/org/argeo/app/docbook/DbkMsg.java
index 8e87231..2f34988 100644
--- a/org.argeo.app.core/src/org/argeo/docbook/DbkMsg.java
+++ b/org.argeo.app.core/src/org/argeo/app/docbook/DbkMsg.java
@@ -1,4 +1,4 @@
-package org.argeo.docbook;
+package org.argeo.app.docbook;
 
 import org.argeo.cms.Localized;
 
diff --git a/org.argeo.app.core/src/org/argeo/docbook/DbkType.java b/org.argeo.app.core/src/org/argeo/app/docbook/DbkType.java
similarity index 88%
rename from org.argeo.app.core/src/org/argeo/docbook/DbkType.java
rename to org.argeo.app.core/src/org/argeo/app/docbook/DbkType.java
index 005d165..3e3585f 100644
--- a/org.argeo.app.core/src/org/argeo/docbook/DbkType.java
+++ b/org.argeo.app.core/src/org/argeo/app/docbook/DbkType.java
@@ -1,6 +1,6 @@
-package org.argeo.docbook;
+package org.argeo.app.docbook;
 
-import org.argeo.entity.JcrName;
+import org.argeo.app.api.JcrName;
 
 /** Supported DocBook elements */
 public enum DbkType implements JcrName {
diff --git a/org.argeo.app.core/src/org/argeo/docbook/DbkUtils.java b/org.argeo.app.core/src/org/argeo/app/docbook/DbkUtils.java
similarity index 98%
rename from org.argeo.app.core/src/org/argeo/docbook/DbkUtils.java
rename to org.argeo.app.core/src/org/argeo/app/docbook/DbkUtils.java
index f4bf502..6c959f4 100644
--- a/org.argeo.app.core/src/org/argeo/docbook/DbkUtils.java
+++ b/org.argeo.app.core/src/org/argeo/app/docbook/DbkUtils.java
@@ -1,6 +1,6 @@
-package org.argeo.docbook;
+package org.argeo.app.docbook;
 
-import static org.argeo.docbook.DbkType.para;
+import static org.argeo.app.docbook.DbkType.para;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -16,7 +16,7 @@ import javax.jcr.RepositoryException;
 import javax.jcr.ValueFormatException;
 
 import org.argeo.api.cms.CmsLog;
-import org.argeo.entity.EntityType;
+import org.argeo.app.api.EntityType;
 import org.argeo.jcr.Jcr;
 import org.argeo.jcr.JcrException;
 import org.argeo.jcr.JcrUtils;
diff --git a/org.argeo.app.core/src/org/argeo/docbook/db4-upgrade.xsl b/org.argeo.app.core/src/org/argeo/app/docbook/db4-upgrade.xsl
similarity index 100%
rename from org.argeo.app.core/src/org/argeo/docbook/db4-upgrade.xsl
rename to org.argeo.app.core/src/org/argeo/app/docbook/db4-upgrade.xsl
diff --git a/org.argeo.app.core/src/org/argeo/docbook/docbook-full.cnd b/org.argeo.app.core/src/org/argeo/app/docbook/docbook-full.cnd
similarity index 100%
rename from org.argeo.app.core/src/org/argeo/docbook/docbook-full.cnd
rename to org.argeo.app.core/src/org/argeo/app/docbook/docbook-full.cnd
diff --git a/org.argeo.app.core/src/org/argeo/docbook/docbook.cnd b/org.argeo.app.core/src/org/argeo/app/docbook/docbook.cnd
similarity index 100%
rename from org.argeo.app.core/src/org/argeo/docbook/docbook.cnd
rename to org.argeo.app.core/src/org/argeo/app/docbook/docbook.cnd
diff --git a/org.argeo.app.core/src/org/argeo/geo/GeoJsonUtils.java b/org.argeo.app.core/src/org/argeo/app/geo/GeoJsonUtils.java
similarity index 95%
rename from org.argeo.app.core/src/org/argeo/geo/GeoJsonUtils.java
rename to org.argeo.app.core/src/org/argeo/app/geo/GeoJsonUtils.java
index 0d58480..84610c8 100644
--- a/org.argeo.app.core/src/org/argeo/geo/GeoJsonUtils.java
+++ b/org.argeo.app.core/src/org/argeo/app/geo/GeoJsonUtils.java
@@ -1,4 +1,4 @@
-package org.argeo.geo;
+package org.argeo.app.geo;
 
 import java.util.Map;
 
diff --git a/org.argeo.app.core/src/org/argeo/geo/GeoToSvg.java b/org.argeo.app.core/src/org/argeo/app/geo/GeoToSvg.java
similarity index 98%
rename from org.argeo.app.core/src/org/argeo/geo/GeoToSvg.java
rename to org.argeo.app.core/src/org/argeo/app/geo/GeoToSvg.java
index 4d593f2..abb5b39 100644
--- a/org.argeo.app.core/src/org/argeo/geo/GeoToSvg.java
+++ b/org.argeo.app.core/src/org/argeo/app/geo/GeoToSvg.java
@@ -1,4 +1,4 @@
-package org.argeo.geo;
+package org.argeo.app.geo;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/org.argeo.app.core/src/org/argeo/support/geonames/GeonamesAdm.java b/org.argeo.app.core/src/org/argeo/app/geo/geonames/GeonamesAdm.java
similarity index 98%
rename from org.argeo.app.core/src/org/argeo/support/geonames/GeonamesAdm.java
rename to org.argeo.app.core/src/org/argeo/app/geo/geonames/GeonamesAdm.java
index d578272..45febd2 100644
--- a/org.argeo.app.core/src/org/argeo/support/geonames/GeonamesAdm.java
+++ b/org.argeo.app.core/src/org/argeo/app/geo/geonames/GeonamesAdm.java
@@ -1,4 +1,4 @@
-package org.argeo.support.geonames;
+package org.argeo.app.geo.geonames;
 
 import java.time.LocalDate;
 import java.time.ZoneId;
diff --git a/org.argeo.app.core/src/org/argeo/support/geonames/ImportGeonamesAdmin.java b/org.argeo.app.core/src/org/argeo/app/geo/geonames/ImportGeonamesAdmin.java
similarity index 98%
rename from org.argeo.app.core/src/org/argeo/support/geonames/ImportGeonamesAdmin.java
rename to org.argeo.app.core/src/org/argeo/app/geo/geonames/ImportGeonamesAdmin.java
index 9af5987..52456bb 100644
--- a/org.argeo.app.core/src/org/argeo/support/geonames/ImportGeonamesAdmin.java
+++ b/org.argeo.app.core/src/org/argeo/app/geo/geonames/ImportGeonamesAdmin.java
@@ -1,4 +1,4 @@
-package org.argeo.support.geonames;
+package org.argeo.app.geo.geonames;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/org.argeo.app.core/src/org/argeo/suite/library/DocxExtractor.java b/org.argeo.app.core/src/org/argeo/app/library/DocxExtractor.java
similarity index 99%
rename from org.argeo.app.core/src/org/argeo/suite/library/DocxExtractor.java
rename to org.argeo.app.core/src/org/argeo/app/library/DocxExtractor.java
index 53e73f3..17c6cf2 100644
--- a/org.argeo.app.core/src/org/argeo/suite/library/DocxExtractor.java
+++ b/org.argeo.app.core/src/org/argeo/app/library/DocxExtractor.java
@@ -1,4 +1,4 @@
-package org.argeo.suite.library;
+package org.argeo.app.library;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/org.argeo.app.core/src/org/argeo/support/odk/BundleResourceOdkForm.java b/org.argeo.app.core/src/org/argeo/app/odk/BundleResourceOdkForm.java
similarity index 98%
rename from org.argeo.app.core/src/org/argeo/support/odk/BundleResourceOdkForm.java
rename to org.argeo.app.core/src/org/argeo/app/odk/BundleResourceOdkForm.java
index fc55f35..97f978b 100644
--- a/org.argeo.app.core/src/org/argeo/support/odk/BundleResourceOdkForm.java
+++ b/org.argeo.app.core/src/org/argeo/app/odk/BundleResourceOdkForm.java
@@ -1,4 +1,4 @@
-package org.argeo.support.odk;
+package org.argeo.app.odk;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
diff --git a/org.argeo.app.core/src/org/argeo/support/odk/OdkForm.java b/org.argeo.app.core/src/org/argeo/app/odk/OdkForm.java
similarity index 89%
rename from org.argeo.app.core/src/org/argeo/support/odk/OdkForm.java
rename to org.argeo.app.core/src/org/argeo/app/odk/OdkForm.java
index 7b79a13..ec37a6f 100644
--- a/org.argeo.app.core/src/org/argeo/support/odk/OdkForm.java
+++ b/org.argeo.app.core/src/org/argeo/app/odk/OdkForm.java
@@ -1,4 +1,4 @@
-package org.argeo.support.odk;
+package org.argeo.app.odk;
 
 import java.io.InputStream;
 
diff --git a/org.argeo.app.core/src/org/argeo/support/odk/OdkNames.java b/org.argeo.app.core/src/org/argeo/app/odk/OdkNames.java
similarity index 77%
rename from org.argeo.app.core/src/org/argeo/support/odk/OdkNames.java
rename to org.argeo.app.core/src/org/argeo/app/odk/OdkNames.java
index fbb2087..7702f83 100644
--- a/org.argeo.app.core/src/org/argeo/support/odk/OdkNames.java
+++ b/org.argeo.app.core/src/org/argeo/app/odk/OdkNames.java
@@ -1,4 +1,4 @@
-package org.argeo.support.odk;
+package org.argeo.app.odk;
 
 /** Names related to ODK. */
 public interface OdkNames {
diff --git a/org.argeo.app.core/src/org/argeo/support/odk/OdkUtils.java b/org.argeo.app.core/src/org/argeo/app/odk/OdkUtils.java
similarity index 98%
rename from org.argeo.app.core/src/org/argeo/support/odk/OdkUtils.java
rename to org.argeo.app.core/src/org/argeo/app/odk/OdkUtils.java
index 940103f..ff77738 100644
--- a/org.argeo.app.core/src/org/argeo/support/odk/OdkUtils.java
+++ b/org.argeo.app.core/src/org/argeo/app/odk/OdkUtils.java
@@ -1,4 +1,4 @@
-package org.argeo.support.odk;
+package org.argeo.app.odk;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -21,8 +21,8 @@ import javax.jcr.query.Row;
 import javax.jcr.query.RowIterator;
 
 import org.argeo.api.cms.CmsLog;
-import org.argeo.entity.EntityMimeType;
-import org.argeo.entity.EntityType;
+import org.argeo.app.api.EntityMimeType;
+import org.argeo.app.api.EntityType;
 import org.argeo.jcr.Jcr;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.jcr.JcrxApi;
diff --git a/org.argeo.app.core/src/org/argeo/support/odk/OrxListName.java b/org.argeo.app.core/src/org/argeo/app/odk/OrxListName.java
similarity index 87%
rename from org.argeo.app.core/src/org/argeo/support/odk/OrxListName.java
rename to org.argeo.app.core/src/org/argeo/app/odk/OrxListName.java
index 0404c90..ec9b699 100644
--- a/org.argeo.app.core/src/org/argeo/support/odk/OrxListName.java
+++ b/org.argeo.app.core/src/org/argeo/app/odk/OrxListName.java
@@ -1,6 +1,6 @@
-package org.argeo.support.odk;
+package org.argeo.app.odk;
 
-import org.argeo.entity.JcrName;
+import org.argeo.app.api.JcrName;
 
 /** Types related to the http://openrosa.org/xforms/xformsList namespace. */
 public enum OrxListName implements JcrName {
diff --git a/org.argeo.app.core/src/org/argeo/support/odk/OrxManifestName.java b/org.argeo.app.core/src/org/argeo/app/odk/OrxManifestName.java
similarity index 87%
rename from org.argeo.app.core/src/org/argeo/support/odk/OrxManifestName.java
rename to org.argeo.app.core/src/org/argeo/app/odk/OrxManifestName.java
index c9fcc5d..5c93c41 100644
--- a/org.argeo.app.core/src/org/argeo/support/odk/OrxManifestName.java
+++ b/org.argeo.app.core/src/org/argeo/app/odk/OrxManifestName.java
@@ -1,6 +1,6 @@
-package org.argeo.support.odk;
+package org.argeo.app.odk;
 
-import org.argeo.entity.JcrName;
+import org.argeo.app.api.JcrName;
 
 /** Types related to the http://openrosa.org/xforms/xformsList namespace. */
 public enum OrxManifestName implements JcrName {
diff --git a/org.argeo.app.core/src/org/argeo/support/odk/OrxType.java b/org.argeo.app.core/src/org/argeo/app/odk/OrxType.java
similarity index 86%
rename from org.argeo.app.core/src/org/argeo/support/odk/OrxType.java
rename to org.argeo.app.core/src/org/argeo/app/odk/OrxType.java
index 3b5d601..cf88eb9 100644
--- a/org.argeo.app.core/src/org/argeo/support/odk/OrxType.java
+++ b/org.argeo.app.core/src/org/argeo/app/odk/OrxType.java
@@ -1,6 +1,6 @@
-package org.argeo.support.odk;
+package org.argeo.app.odk;
 
-import org.argeo.entity.JcrName;
+import org.argeo.app.api.JcrName;
 
 /** Types related to the http://openrosa.org/xforms/xformsList namespace. */
 public enum OrxType implements JcrName {
diff --git a/org.argeo.app.core/src/org/argeo/support/odk/odk.cnd b/org.argeo.app.core/src/org/argeo/app/odk/odk.cnd
similarity index 100%
rename from org.argeo.app.core/src/org/argeo/support/odk/odk.cnd
rename to org.argeo.app.core/src/org/argeo/app/odk/odk.cnd
diff --git a/org.argeo.app.core/src/org/argeo/support/xforms/FormSubmissionListener.java b/org.argeo.app.core/src/org/argeo/app/xforms/FormSubmissionListener.java
similarity index 90%
rename from org.argeo.app.core/src/org/argeo/support/xforms/FormSubmissionListener.java
rename to org.argeo.app.core/src/org/argeo/app/xforms/FormSubmissionListener.java
index e23ef36..7122892 100644
--- a/org.argeo.app.core/src/org/argeo/support/xforms/FormSubmissionListener.java
+++ b/org.argeo.app.core/src/org/argeo/app/xforms/FormSubmissionListener.java
@@ -1,4 +1,4 @@
-package org.argeo.support.xforms;
+package org.argeo.app.xforms;
 
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
diff --git a/org.argeo.app.core/src/org/argeo/support/xforms/xforms.cnd b/org.argeo.app.core/src/org/argeo/app/xforms/xforms.cnd
similarity index 100%
rename from org.argeo.app.core/src/org/argeo/support/xforms/xforms.cnd
rename to org.argeo.app.core/src/org/argeo/app/xforms/xforms.cnd
diff --git a/org.argeo.app.servlet.odk/OSGI-INF/odkFormListServlet.xml b/org.argeo.app.servlet.odk/OSGI-INF/odkFormListServlet.xml
index 937b474..89adf62 100644
--- a/org.argeo.app.servlet.odk/OSGI-INF/odkFormListServlet.xml
+++ b/org.argeo.app.servlet.odk/OSGI-INF/odkFormListServlet.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="ODK Form List Servlet">
-   <implementation class="org.argeo.support.odk.servlet.OdkFormListServlet"/>
+   <implementation class="org.argeo.app.odk.servlet.OdkFormListServlet"/>
    <service>
       <provide interface="javax.servlet.Servlet"/>
    </service>
    <property name="osgi.http.whiteboard.servlet.pattern" type="String" value="/formList/*"/>
    <property name="osgi.http.whiteboard.context.select" type="String" value="(osgi.http.whiteboard.context.name=odkServletContext)"/>
-   <reference bind="addForm" cardinality="0..n" interface="org.argeo.support.odk.OdkForm" name="OdkForm" policy="dynamic" unbind="removeForm"/>
+   <reference bind="addForm" cardinality="0..n" interface="org.argeo.app.odk.OdkForm" name="OdkForm" policy="dynamic" unbind="removeForm"/>
    <reference bind="setRepository" cardinality="1..1" interface="javax.jcr.Repository" name="Repository" policy="static" target="(cn=odk)"/>
 </scr:component>
diff --git a/org.argeo.app.servlet.odk/OSGI-INF/odkFormServlet.xml b/org.argeo.app.servlet.odk/OSGI-INF/odkFormServlet.xml
index 7f7e4db..ee31031 100644
--- a/org.argeo.app.servlet.odk/OSGI-INF/odkFormServlet.xml
+++ b/org.argeo.app.servlet.odk/OSGI-INF/odkFormServlet.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="ODK Form Servlet">
-   <implementation class="org.argeo.support.odk.servlet.OdkFormServlet"/>
+   <implementation class="org.argeo.app.odk.servlet.OdkFormServlet"/>
    <service>
       <provide interface="javax.servlet.Servlet"/>
    </service>
    <property name="osgi.http.whiteboard.servlet.pattern" type="String" value="/form/*"/>
    <property name="osgi.http.whiteboard.context.select" type="String" value="(osgi.http.whiteboard.context.name=odkServletContext)"/>
-   <reference bind="addForm" cardinality="0..n" interface="org.argeo.support.odk.OdkForm" name="OdkForm" policy="dynamic" unbind="removeForm"/>
+   <reference bind="addForm" cardinality="0..n" interface="org.argeo.app.odk.OdkForm" name="OdkForm" policy="dynamic" unbind="removeForm"/>
    <reference bind="setRepository" cardinality="1..1" interface="javax.jcr.Repository" name="Repository" policy="static" target="(cn=odk)"/>
 </scr:component>
diff --git a/org.argeo.app.servlet.odk/OSGI-INF/odkManifestServlet.xml b/org.argeo.app.servlet.odk/OSGI-INF/odkManifestServlet.xml
index cfc56ef..00fd3db 100644
--- a/org.argeo.app.servlet.odk/OSGI-INF/odkManifestServlet.xml
+++ b/org.argeo.app.servlet.odk/OSGI-INF/odkManifestServlet.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="ODK Manifest Servlet">
-   <implementation class="org.argeo.support.odk.servlet.OdkManifestServlet"/>
+   <implementation class="org.argeo.app.odk.servlet.OdkManifestServlet"/>
    <service>
       <provide interface="javax.servlet.Servlet"/>
    </service>
diff --git a/org.argeo.app.servlet.odk/OSGI-INF/odkServletContext.xml b/org.argeo.app.servlet.odk/OSGI-INF/odkServletContext.xml
index 78b5b66..78c6af2 100644
--- a/org.argeo.app.servlet.odk/OSGI-INF/odkServletContext.xml
+++ b/org.argeo.app.servlet.odk/OSGI-INF/odkServletContext.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="init" deactivate="destroy" name="ODK Servlet Context">
-   <implementation class="org.argeo.support.odk.servlet.OdkServletContext"/>
+   <implementation class="org.argeo.app.odk.servlet.OdkServletContext"/>
    <service>
       <provide interface="org.osgi.service.http.context.ServletContextHelper"/>
    </service>
diff --git a/org.argeo.app.servlet.odk/OSGI-INF/odkSubmissionServlet.xml b/org.argeo.app.servlet.odk/OSGI-INF/odkSubmissionServlet.xml
index bce66c4..bc76592 100644
--- a/org.argeo.app.servlet.odk/OSGI-INF/odkSubmissionServlet.xml
+++ b/org.argeo.app.servlet.odk/OSGI-INF/odkSubmissionServlet.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="ODK Submission Servlet">
-   <implementation class="org.argeo.support.odk.servlet.OdkSubmissionServlet"/>
+   <implementation class="org.argeo.app.odk.servlet.OdkSubmissionServlet"/>
    <service>
       <provide interface="javax.servlet.Servlet"/>
    </service>
@@ -8,5 +8,5 @@
    <property name="osgi.http.whiteboard.context.select" type="String" value="(osgi.http.whiteboard.context.name=odkServletContext)"/>
    <property name="osgi.http.whiteboard.servlet.multipart.enabled" type="String" value="true"/>
    <reference bind="setRepository" cardinality="1..1" interface="javax.jcr.Repository" name="Repository" policy="static" target="(cn=odk)"/>
-   <reference bind="addSubmissionListener" cardinality="0..n" interface="org.argeo.support.xforms.FormSubmissionListener" name="FormSubmissionListener" policy="dynamic" unbind="removeSubmissionListener"/>
+   <reference bind="addSubmissionListener" cardinality="0..n" interface="org.argeo.app.xforms.FormSubmissionListener" name="FormSubmissionListener" policy="dynamic" unbind="removeSubmissionListener"/>
 </scr:component>
diff --git a/org.argeo.app.servlet.odk/src/org/argeo/support/odk/servlet/OdkFormListServlet.java b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkFormListServlet.java
similarity index 96%
rename from org.argeo.app.servlet.odk/src/org/argeo/support/odk/servlet/OdkFormListServlet.java
rename to org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkFormListServlet.java
index 16e525a..c88bf4a 100644
--- a/org.argeo.app.servlet.odk/src/org/argeo/support/odk/servlet/OdkFormListServlet.java
+++ b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkFormListServlet.java
@@ -1,4 +1,4 @@
-package org.argeo.support.odk.servlet;
+package org.argeo.app.servlet.odk;
 
 import java.io.IOException;
 import java.io.Writer;
@@ -21,14 +21,14 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.argeo.api.cms.CmsConstants;
 import org.argeo.api.cms.CmsLog;
+import org.argeo.app.api.EntityType;
+import org.argeo.app.odk.OdkForm;
+import org.argeo.app.odk.OrxListName;
+import org.argeo.app.odk.OrxManifestName;
 import org.argeo.cms.auth.RemoteAuthUtils;
 import org.argeo.cms.servlet.ServletHttpRequest;
-import org.argeo.entity.EntityType;
 import org.argeo.jcr.Jcr;
 import org.argeo.jcr.JcrxApi;
-import org.argeo.support.odk.OdkForm;
-import org.argeo.support.odk.OrxListName;
-import org.argeo.support.odk.OrxManifestName;
 
 /** Lists available forms. */
 public class OdkFormListServlet extends HttpServlet {
diff --git a/org.argeo.app.servlet.odk/src/org/argeo/support/odk/servlet/OdkFormServlet.java b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkFormServlet.java
similarity index 95%
rename from org.argeo.app.servlet.odk/src/org/argeo/support/odk/servlet/OdkFormServlet.java
rename to org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkFormServlet.java
index 9f84e52..067262e 100644
--- a/org.argeo.app.servlet.odk/src/org/argeo/support/odk/servlet/OdkFormServlet.java
+++ b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkFormServlet.java
@@ -1,4 +1,4 @@
-package org.argeo.support.odk.servlet;
+package org.argeo.app.servlet.odk;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -18,11 +18,11 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.io.FilenameUtils;
+import org.argeo.app.odk.OdkForm;
+import org.argeo.app.odk.OdkNames;
 import org.argeo.cms.auth.RemoteAuthUtils;
 import org.argeo.cms.servlet.ServletHttpRequest;
 import org.argeo.jcr.Jcr;
-import org.argeo.support.odk.OdkForm;
-import org.argeo.support.odk.OdkNames;
 
 /** Retrieves a single form. */
 public class OdkFormServlet extends HttpServlet {
diff --git a/org.argeo.app.servlet.odk/src/org/argeo/support/odk/servlet/OdkManifestServlet.java b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkManifestServlet.java
similarity index 98%
rename from org.argeo.app.servlet.odk/src/org/argeo/support/odk/servlet/OdkManifestServlet.java
rename to org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkManifestServlet.java
index 63472fc..245e0f2 100644
--- a/org.argeo.app.servlet.odk/src/org/argeo/support/odk/servlet/OdkManifestServlet.java
+++ b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkManifestServlet.java
@@ -1,4 +1,4 @@
-package org.argeo.support.odk.servlet;
+package org.argeo.app.servlet.odk;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -29,12 +29,12 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.io.output.NullOutputStream;
+import org.argeo.app.api.EntityMimeType;
+import org.argeo.app.odk.OrxManifestName;
 import org.argeo.cms.auth.RemoteAuthUtils;
 import org.argeo.cms.servlet.ServletHttpRequest;
-import org.argeo.entity.EntityMimeType;
 import org.argeo.jcr.Jcr;
 import org.argeo.jcr.JcrException;
-import org.argeo.support.odk.OrxManifestName;
 import org.argeo.util.CsvWriter;
 import org.argeo.util.DigestUtils;
 
diff --git a/org.argeo.app.servlet.odk/src/org/argeo/support/odk/servlet/OdkServletContext.java b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkServletContext.java
similarity index 93%
rename from org.argeo.app.servlet.odk/src/org/argeo/support/odk/servlet/OdkServletContext.java
rename to org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkServletContext.java
index f06965d..4e2d535 100644
--- a/org.argeo.app.servlet.odk/src/org/argeo/support/odk/servlet/OdkServletContext.java
+++ b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkServletContext.java
@@ -1,4 +1,4 @@
-package org.argeo.support.odk.servlet;
+package org.argeo.app.servlet.odk;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
diff --git a/org.argeo.app.servlet.odk/src/org/argeo/support/odk/servlet/OdkSubmissionServlet.java b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkSubmissionServlet.java
similarity index 96%
rename from org.argeo.app.servlet.odk/src/org/argeo/support/odk/servlet/OdkSubmissionServlet.java
rename to org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkSubmissionServlet.java
index 9e0c800..9596ebd 100644
--- a/org.argeo.app.servlet.odk/src/org/argeo/support/odk/servlet/OdkSubmissionServlet.java
+++ b/org.argeo.app.servlet.odk/src/org/argeo/app/servlet/odk/OdkSubmissionServlet.java
@@ -1,4 +1,4 @@
-package org.argeo.support.odk.servlet;
+package org.argeo.app.servlet.odk;
 
 import java.io.IOException;
 import java.time.Instant;
@@ -22,6 +22,9 @@ import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.Part;
 
 import org.argeo.api.cms.CmsSession;
+import org.argeo.app.core.SuiteUtils;
+import org.argeo.app.odk.OrxType;
+import org.argeo.app.xforms.FormSubmissionListener;
 import org.argeo.api.cms.CmsLog;
 import org.argeo.cms.auth.RemoteAuthRequest;
 import org.argeo.cms.auth.RemoteAuthUtils;
@@ -29,9 +32,6 @@ import org.argeo.cms.jcr.CmsJcrUtils;
 import org.argeo.cms.servlet.ServletHttpRequest;
 import org.argeo.jcr.Jcr;
 import org.argeo.jcr.JcrUtils;
-import org.argeo.suite.SuiteUtils;
-import org.argeo.support.odk.OrxType;
-import org.argeo.support.xforms.FormSubmissionListener;
 
 /** Receives a form submission. */
 public class OdkSubmissionServlet extends HttpServlet {
diff --git a/org.argeo.app.servlet.publish/OSGI-INF/dbk4Converter.xml b/org.argeo.app.servlet.publish/OSGI-INF/dbk4Converter.xml
index 66526d9..ccad605 100644
--- a/org.argeo.app.servlet.publish/OSGI-INF/dbk4Converter.xml
+++ b/org.argeo.app.servlet.publish/OSGI-INF/dbk4Converter.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="DocBook 4 Converter">
-   <implementation class="org.argeo.docbook.Dbk4Converter"/>
+   <implementation class="org.argeo.app.docbook.Dbk4Converter"/>
    <service>
-      <provide interface="org.argeo.docbook.Dbk4Converter"/>
+      <provide interface="org.argeo.app.docbook.Dbk4Converter"/>
    </service>
 </scr:component>
diff --git a/org.argeo.app.servlet.publish/OSGI-INF/dbkServlet.xml b/org.argeo.app.servlet.publish/OSGI-INF/dbkServlet.xml
index 05522d5..34a7dcb 100644
--- a/org.argeo.app.servlet.publish/OSGI-INF/dbkServlet.xml
+++ b/org.argeo.app.servlet.publish/OSGI-INF/dbkServlet.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="DocBook Servlet">
-   <implementation class="org.argeo.publishing.servlet.DbkServlet"/>
+   <implementation class="org.argeo.app.servlet.publish.DbkServlet"/>
    <service>
       <provide interface="javax.servlet.Servlet"/>
    </service>
diff --git a/org.argeo.app.servlet.publish/OSGI-INF/documentUiProvider.xml b/org.argeo.app.servlet.publish/OSGI-INF/documentUiProvider.xml
index 5cee79f..3711fd5 100644
--- a/org.argeo.app.servlet.publish/OSGI-INF/documentUiProvider.xml
+++ b/org.argeo.app.servlet.publish/OSGI-INF/documentUiProvider.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0">
-   <implementation class="org.argeo.publishing.ui.DocumentUiProvider"/>
+   <implementation class="org.argeo.app.ui.publish.DocumentUiProvider"/>
    <service>
       <provide interface="org.argeo.cms.ui.CmsUiProvider"/>
    </service>
diff --git a/org.argeo.app.servlet.publish/OSGI-INF/fontsServlet.xml b/org.argeo.app.servlet.publish/OSGI-INF/fontsServlet.xml
index 6ca1c41..7b71008 100644
--- a/org.argeo.app.servlet.publish/OSGI-INF/fontsServlet.xml
+++ b/org.argeo.app.servlet.publish/OSGI-INF/fontsServlet.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0">
-   <implementation class="org.argeo.publishing.servlet.FontsServlet"/>
+   <implementation class="org.argeo.app.servlet.publish.FontsServlet"/>
    <service>
       <provide interface="javax.servlet.Servlet"/>
    </service>
diff --git a/org.argeo.app.servlet.publish/OSGI-INF/wwwLayer.xml b/org.argeo.app.servlet.publish/OSGI-INF/wwwLayer.xml
index 497d652..0fc0edb 100644
--- a/org.argeo.app.servlet.publish/OSGI-INF/wwwLayer.xml
+++ b/org.argeo.app.servlet.publish/OSGI-INF/wwwLayer.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="init" deactivate="destroy">
-   <implementation class="org.argeo.suite.ui.DefaultEditionLayer"/>
+   <implementation class="org.argeo.app.ui.DefaultEditionLayer"/>
    <properties entry="config/wwwLayer.properties"/>
    <service>
-      <provide interface="org.argeo.suite.ui.SuiteLayer"/>
+      <provide interface="org.argeo.app.ui.SuiteLayer"/>
    </service>
    <reference bind="setWorkArea" cardinality="1..1" interface="org.argeo.cms.ui.CmsUiProvider" name="CmsUiProvider" policy="dynamic" target="(service.pid=argeo.publishing.ui.documentUiProvider)"/>
 </scr:component>
diff --git a/org.argeo.app.servlet.publish/bnd.bnd b/org.argeo.app.servlet.publish/bnd.bnd
index 463e24b..b8c62f9 100644
--- a/org.argeo.app.servlet.publish/bnd.bnd
+++ b/org.argeo.app.servlet.publish/bnd.bnd
@@ -2,13 +2,12 @@ Import-Package:\
 org.osgi.service.http.context,\
 javax.jcr.nodetype,\
 org.osgi.service.event,\
-org.argeo.suite.ui,\
 org.eclipse.swt,\
 org.eclipse.jface.viewers,\
 org.osgi.framework,\
 org.apache.xml.serializer,\
 org.eclipse.rap.rwt,\
-org.argeo.entity,\
+org.argeo.app.api,\
 *
 
 Provide-Capability:\
diff --git a/org.argeo.app.servlet.publish/src/org/argeo/publishing/servlet/DbkServlet.java b/org.argeo.app.servlet.publish/src/org/argeo/app/servlet/publish/DbkServlet.java
similarity index 98%
rename from org.argeo.app.servlet.publish/src/org/argeo/publishing/servlet/DbkServlet.java
rename to org.argeo.app.servlet.publish/src/org/argeo/app/servlet/publish/DbkServlet.java
index 26a0fed..51f2332 100644
--- a/org.argeo.app.servlet.publish/src/org/argeo/publishing/servlet/DbkServlet.java
+++ b/org.argeo.app.servlet.publish/src/org/argeo/app/servlet/publish/DbkServlet.java
@@ -1,4 +1,4 @@
-package org.argeo.publishing.servlet;
+package org.argeo.app.servlet.publish;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -36,10 +36,10 @@ import javax.xml.transform.stream.StreamSource;
 import org.apache.commons.io.IOUtils;
 import org.apache.xalan.processor.TransformerFactoryImpl;
 import org.argeo.api.cms.CmsTheme;
+import org.argeo.app.docbook.DbkType;
+import org.argeo.app.docbook.DbkUtils;
 import org.argeo.cms.auth.RemoteAuthUtils;
 import org.argeo.cms.servlet.ServletHttpRequest;
-import org.argeo.docbook.DbkType;
-import org.argeo.docbook.DbkUtils;
 import org.argeo.jcr.Jcr;
 import org.argeo.jcr.JcrException;
 import org.argeo.jcr.JcrUtils;
diff --git a/org.argeo.app.servlet.publish/src/org/argeo/publishing/servlet/FontsServlet.java b/org.argeo.app.servlet.publish/src/org/argeo/app/servlet/publish/FontsServlet.java
similarity index 97%
rename from org.argeo.app.servlet.publish/src/org/argeo/publishing/servlet/FontsServlet.java
rename to org.argeo.app.servlet.publish/src/org/argeo/app/servlet/publish/FontsServlet.java
index aa116f5..01e212e 100644
--- a/org.argeo.app.servlet.publish/src/org/argeo/publishing/servlet/FontsServlet.java
+++ b/org.argeo.app.servlet.publish/src/org/argeo/app/servlet/publish/FontsServlet.java
@@ -1,4 +1,4 @@
-package org.argeo.publishing.servlet;
+package org.argeo.app.servlet.publish;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/org.argeo.app.ui/OSGI-INF/adminLeadPane.xml b/org.argeo.app.ui/OSGI-INF/adminLeadPane.xml
index 0d060fb..0a2818a 100644
--- a/org.argeo.app.ui/OSGI-INF/adminLeadPane.xml
+++ b/org.argeo.app.ui/OSGI-INF/adminLeadPane.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="init" deactivate="destroy" immediate="false" name="Admin Lead Pane">
-   <implementation class="org.argeo.suite.ui.DefaultLeadPane"/>
+   <implementation class="org.argeo.app.ui.DefaultLeadPane"/>
    <service>
       <provide interface="org.argeo.cms.ui.CmsUiProvider"/>
    </service>
    <properties entry="config/adminLeadPane.properties"/>
    <property name="defaultLayers" type="String">argeo.suite.ui.termsLayer
    </property>
-   <reference bind="addLayer" cardinality="1..n" interface="org.argeo.suite.ui.SuiteLayer" name="SuiteLayer" policy="dynamic" unbind="removeLayer"/>
+   <reference bind="addLayer" cardinality="1..n" interface="org.argeo.app.ui.SuiteLayer" name="SuiteLayer" policy="dynamic" unbind="removeLayer"/>
 </scr:component>
diff --git a/org.argeo.app.ui/OSGI-INF/cmsApp.xml b/org.argeo.app.ui/OSGI-INF/cmsApp.xml
index bfb372a..20373ae 100644
--- a/org.argeo.app.ui/OSGI-INF/cmsApp.xml
+++ b/org.argeo.app.ui/OSGI-INF/cmsApp.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="init" deactivate="destroy" name="Argeo Suite App">
-   <implementation class="org.argeo.suite.ui.SuiteApp"/>
+   <implementation class="org.argeo.app.ui.SuiteApp"/>
    <service>
       <provide interface="org.argeo.api.cms.CmsApp"/>
       <provide interface="org.osgi.service.event.EventHandler"/>
@@ -9,6 +9,6 @@
    <reference bind="addUiProvider" cardinality="0..n" interface="org.argeo.cms.ui.CmsUiProvider" name="CmsUiProvider" policy="dynamic" unbind="removeUiProvider"/>
    <reference bind="addTheme" cardinality="1..n" interface="org.argeo.api.cms.CmsTheme" name="CmsTheme" policy="dynamic" unbind="removeTheme"/>
    <reference bind="setRepository" cardinality="1..1" interface="javax.jcr.Repository" name="Repository" policy="dynamic" target="(cn=ego)"/>
-   <reference bind="addLayer" cardinality="1..n" interface="org.argeo.suite.ui.SuiteLayer" name="SuiteLayer" policy="dynamic" unbind="removeLayer"/>
+   <reference bind="addLayer" cardinality="1..n" interface="org.argeo.app.ui.SuiteLayer" name="SuiteLayer" policy="dynamic" unbind="removeLayer"/>
    <reference bind="setCmsUserManager" cardinality="1..1" interface="org.argeo.cms.CmsUserManager" name="CmsUserManager" policy="static"/>
 </scr:component>
diff --git a/org.argeo.app.ui/OSGI-INF/dashboard.xml b/org.argeo.app.ui/OSGI-INF/dashboard.xml
index f678b5b..9ee5857 100644
--- a/org.argeo.app.ui/OSGI-INF/dashboard.xml
+++ b/org.argeo.app.ui/OSGI-INF/dashboard.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="Default Dashboard">
-   <implementation class="org.argeo.suite.ui.DefaultDashboard"/>
+   <implementation class="org.argeo.app.ui.DefaultDashboard"/>
    <service>
       <provide interface="org.argeo.cms.ui.CmsUiProvider"/>
    </service>
diff --git a/org.argeo.app.ui/OSGI-INF/dashboardLayer.xml b/org.argeo.app.ui/OSGI-INF/dashboardLayer.xml
index b60eafc..436a8e6 100644
--- a/org.argeo.app.ui/OSGI-INF/dashboardLayer.xml
+++ b/org.argeo.app.ui/OSGI-INF/dashboardLayer.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="Dashboard Layer">
-   <implementation class="org.argeo.suite.ui.DefaultEditionLayer"/>
+   <implementation class="org.argeo.app.ui.DefaultEditionLayer"/>
    <service>
-      <provide interface="org.argeo.suite.ui.SuiteLayer"/>
+      <provide interface="org.argeo.app.ui.SuiteLayer"/>
    </service>
    <properties entry="config/dashboardLayer.properties"/>
    <reference bind="setEntryArea" cardinality="1..1" interface="org.argeo.cms.ui.CmsUiProvider" name="CmsUiProvider" policy="dynamic" target="(service.pid=argeo.suite.ui.recentItems)"/>
diff --git a/org.argeo.app.ui/OSGI-INF/eventRecorder.xml b/org.argeo.app.ui/OSGI-INF/eventRecorder.xml
index 49badfd..ab1a6ae 100644
--- a/org.argeo.app.ui/OSGI-INF/eventRecorder.xml
+++ b/org.argeo.app.ui/OSGI-INF/eventRecorder.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="init" deactivate="destroy" name="Event Recorder">
-   <implementation class="org.argeo.suite.ui.EventRecorder"/>
+   <implementation class="org.argeo.app.ui.EventRecorder"/>
    <service>
       <provide interface="org.osgi.service.event.EventHandler"/>
    </service>
diff --git a/org.argeo.app.ui/OSGI-INF/footer.xml b/org.argeo.app.ui/OSGI-INF/footer.xml
index 3499b4f..5e9a857 100644
--- a/org.argeo.app.ui/OSGI-INF/footer.xml
+++ b/org.argeo.app.ui/OSGI-INF/footer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="init" deactivate="destroy" immediate="false" name="Default Suite Footer">
-   <implementation class="org.argeo.suite.ui.DefaultFooter"/>
+   <implementation class="org.argeo.app.ui.DefaultFooter"/>
    <service>
       <provide interface="org.argeo.cms.ui.CmsUiProvider"/>
    </service>
diff --git a/org.argeo.app.ui/OSGI-INF/header.xml b/org.argeo.app.ui/OSGI-INF/header.xml
index 526d9f9..0c83dc6 100644
--- a/org.argeo.app.ui/OSGI-INF/header.xml
+++ b/org.argeo.app.ui/OSGI-INF/header.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="init" deactivate="destroy" immediate="false" name="Default Suite Header">
-   <implementation class="org.argeo.suite.ui.DefaultHeader"/>
+   <implementation class="org.argeo.app.ui.DefaultHeader"/>
    <service>
       <provide interface="org.argeo.cms.ui.CmsUiProvider"/>
    </service>
diff --git a/org.argeo.app.ui/OSGI-INF/leadPane.xml b/org.argeo.app.ui/OSGI-INF/leadPane.xml
index c43d933..c2c2104 100644
--- a/org.argeo.app.ui/OSGI-INF/leadPane.xml
+++ b/org.argeo.app.ui/OSGI-INF/leadPane.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="init" deactivate="destroy" immediate="false" name="Default Lead Pane">
-   <implementation class="org.argeo.suite.ui.DefaultLeadPane"/>
+   <implementation class="org.argeo.app.ui.DefaultLeadPane"/>
    <service>
       <provide interface="org.argeo.cms.ui.CmsUiProvider"/>
    </service>
@@ -10,5 +10,5 @@ argeo.library.ui.contentLayer
 argeo.people.ui.peopleLayer
 argeo.geo.ui.mapLayer
    </property>
-   <reference bind="addLayer" cardinality="1..n" interface="org.argeo.suite.ui.SuiteLayer" name="SuiteLayer" policy="dynamic" unbind="removeLayer"/>
+   <reference bind="addLayer" cardinality="1..n" interface="org.argeo.app.ui.SuiteLayer" name="SuiteLayer" policy="dynamic" unbind="removeLayer"/>
 </scr:component>
diff --git a/org.argeo.app.ui/OSGI-INF/loginScreen.xml b/org.argeo.app.ui/OSGI-INF/loginScreen.xml
index 0c5377a..ec7862d 100644
--- a/org.argeo.app.ui/OSGI-INF/loginScreen.xml
+++ b/org.argeo.app.ui/OSGI-INF/loginScreen.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="Default Login Screen">
-   <implementation class="org.argeo.suite.ui.DefaultLoginScreen"/>
+   <implementation class="org.argeo.app.ui.DefaultLoginScreen"/>
    <properties entry="config/loginScreen.properties"/>
    <service>
       <provide interface="org.argeo.cms.ui.CmsUiProvider"/>
diff --git a/org.argeo.app.ui/OSGI-INF/recentItems.xml b/org.argeo.app.ui/OSGI-INF/recentItems.xml
index 8aaee16..21c23e3 100644
--- a/org.argeo.app.ui/OSGI-INF/recentItems.xml
+++ b/org.argeo.app.ui/OSGI-INF/recentItems.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="init" name="Default Recent Items">
-   <implementation class="org.argeo.suite.ui.RecentItems"/>
+   <implementation class="org.argeo.app.ui.RecentItems"/>
    <service>
       <provide interface="org.argeo.cms.ui.CmsUiProvider"/>
    </service>
diff --git a/org.argeo.app.ui/OSGI-INF/termsEntryArea.xml b/org.argeo.app.ui/OSGI-INF/termsEntryArea.xml
index cfcae11..0435f69 100644
--- a/org.argeo.app.ui/OSGI-INF/termsEntryArea.xml
+++ b/org.argeo.app.ui/OSGI-INF/termsEntryArea.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="Terms Entry Area">
-   <implementation class="org.argeo.suite.ui.TermsEntryArea"/>
+   <implementation class="org.argeo.app.ui.TermsEntryArea"/>
    <service>
       <provide interface="org.argeo.cms.ui.CmsUiProvider"/>
    </service>
diff --git a/org.argeo.app.ui/OSGI-INF/termsLayer.xml b/org.argeo.app.ui/OSGI-INF/termsLayer.xml
index f320dd9..9483e05 100644
--- a/org.argeo.app.ui/OSGI-INF/termsLayer.xml
+++ b/org.argeo.app.ui/OSGI-INF/termsLayer.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="Terms Layer">
-   <implementation class="org.argeo.suite.ui.DefaultEditionLayer"/>
+   <implementation class="org.argeo.app.ui.DefaultEditionLayer"/>
    <service>
-      <provide interface="org.argeo.suite.ui.SuiteLayer"/>
+      <provide interface="org.argeo.app.ui.SuiteLayer"/>
    </service>
    <properties entry="config/termsLayer.properties"/>
    <reference bind="setEntryArea" cardinality="1..1" interface="org.argeo.cms.ui.CmsUiProvider" name="CmsUiProvider" policy="dynamic" target="(service.pid=argeo.suite.ui.termsEntryArea)"/>
diff --git a/org.argeo.app.ui/bnd.bnd b/org.argeo.app.ui/bnd.bnd
index 4dc449b..b21f479 100644
--- a/org.argeo.app.ui/bnd.bnd
+++ b/org.argeo.app.ui/bnd.bnd
@@ -16,7 +16,6 @@ Import-Package:\
 org.argeo.cms.ui.widgets,\
 org.eclipse.swt,\
 org.osgi.framework,\
-org.argeo.entity,\
 org.eclipse.core.commands.common,\
 org.eclipse.jface.window,\
 org.eclipse.jface.dialogs,\
diff --git a/org.argeo.app.ui/pom.xml b/org.argeo.app.ui/pom.xml
index 7e5ea70..0a3e91b 100644
--- a/org.argeo.app.ui/pom.xml
+++ b/org.argeo.app.ui/pom.xml
@@ -18,7 +18,7 @@
 		</dependency>
 <!-- 		<dependency> -->
 <!-- 			<groupId>org.argeo.suite</groupId> -->
-<!-- 			<artifactId>org.argeo.entity.ui</artifactId> -->
+<!-- 			<artifactId>org.argeo.app.api.ui</artifactId> -->
 <!-- 			<version>2.3-SNAPSHOT</version> -->
 <!-- 		</dependency> -->
 
diff --git a/org.argeo.app.ui/src/org/argeo/suite/ui/DefaultDashboard.java b/org.argeo.app.ui/src/org/argeo/app/ui/DefaultDashboard.java
similarity index 96%
rename from org.argeo.app.ui/src/org/argeo/suite/ui/DefaultDashboard.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/DefaultDashboard.java
index 80069d5..50fbed6 100644
--- a/org.argeo.app.ui/src/org/argeo/suite/ui/DefaultDashboard.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/DefaultDashboard.java
@@ -1,4 +1,4 @@
-package org.argeo.suite.ui;
+package org.argeo.app.ui;
 
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
diff --git a/org.argeo.app.ui/src/org/argeo/suite/ui/DefaultEditionLayer.java b/org.argeo.app.ui/src/org/argeo/app/ui/DefaultEditionLayer.java
similarity index 99%
rename from org.argeo.app.ui/src/org/argeo/suite/ui/DefaultEditionLayer.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/DefaultEditionLayer.java
index b36778c..579157d 100644
--- a/org.argeo.app.ui/src/org/argeo/suite/ui/DefaultEditionLayer.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/DefaultEditionLayer.java
@@ -1,4 +1,4 @@
-package org.argeo.suite.ui;
+package org.argeo.app.ui;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -8,11 +8,11 @@ import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
 import org.argeo.api.cms.CmsTheme;
+import org.argeo.app.ui.widgets.TabbedArea;
 import org.argeo.cms.Localized;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.cms.ui.CmsUiProvider;
 import org.argeo.jcr.JcrException;
-import org.argeo.suite.ui.widgets.TabbedArea;
 import org.argeo.util.LangUtils;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.SashForm;
diff --git a/org.argeo.app.ui/src/org/argeo/suite/ui/DefaultFooter.java b/org.argeo.app.ui/src/org/argeo/app/ui/DefaultFooter.java
similarity index 97%
rename from org.argeo.app.ui/src/org/argeo/suite/ui/DefaultFooter.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/DefaultFooter.java
index 9739f29..62a3a23 100644
--- a/org.argeo.app.ui/src/org/argeo/suite/ui/DefaultFooter.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/DefaultFooter.java
@@ -1,4 +1,4 @@
-package org.argeo.suite.ui;
+package org.argeo.app.ui;
 
 import java.util.Map;
 
diff --git a/org.argeo.app.ui/src/org/argeo/suite/ui/DefaultHeader.java b/org.argeo.app.ui/src/org/argeo/app/ui/DefaultHeader.java
similarity index 99%
rename from org.argeo.app.ui/src/org/argeo/suite/ui/DefaultHeader.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/DefaultHeader.java
index fd8be4e..d304493 100644
--- a/org.argeo.app.ui/src/org/argeo/suite/ui/DefaultHeader.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/DefaultHeader.java
@@ -1,4 +1,4 @@
-package org.argeo.suite.ui;
+package org.argeo.app.ui;
 
 import java.util.Map;
 
diff --git a/org.argeo.app.ui/src/org/argeo/suite/ui/DefaultLeadPane.java b/org.argeo.app.ui/src/org/argeo/app/ui/DefaultLeadPane.java
similarity index 98%
rename from org.argeo.app.ui/src/org/argeo/suite/ui/DefaultLeadPane.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/DefaultLeadPane.java
index 2eaba61..5650e9c 100644
--- a/org.argeo.app.ui/src/org/argeo/suite/ui/DefaultLeadPane.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/DefaultLeadPane.java
@@ -1,4 +1,4 @@
-package org.argeo.suite.ui;
+package org.argeo.app.ui;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -13,13 +13,13 @@ import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
 import org.argeo.api.cms.CmsView;
+import org.argeo.app.api.RankedObject;
+import org.argeo.app.core.SuiteUtils;
 import org.argeo.api.cms.CmsLog;
 import org.argeo.cms.Localized;
 import org.argeo.cms.auth.CurrentUser;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.cms.ui.CmsUiProvider;
-import org.argeo.suite.RankedObject;
-import org.argeo.suite.SuiteUtils;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
diff --git a/org.argeo.app.ui/src/org/argeo/suite/ui/DefaultLoginScreen.java b/org.argeo.app.ui/src/org/argeo/app/ui/DefaultLoginScreen.java
similarity index 97%
rename from org.argeo.app.ui/src/org/argeo/suite/ui/DefaultLoginScreen.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/DefaultLoginScreen.java
index a44acf9..0624c48 100644
--- a/org.argeo.app.ui/src/org/argeo/suite/ui/DefaultLoginScreen.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/DefaultLoginScreen.java
@@ -1,4 +1,4 @@
-package org.argeo.suite.ui;
+package org.argeo.app.ui;
 
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
diff --git a/org.argeo.app.ui/src/org/argeo/suite/ui/EventRecorder.java b/org.argeo.app.ui/src/org/argeo/app/ui/EventRecorder.java
similarity index 93%
rename from org.argeo.app.ui/src/org/argeo/suite/ui/EventRecorder.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/EventRecorder.java
index c578816..0607952 100644
--- a/org.argeo.app.ui/src/org/argeo/suite/ui/EventRecorder.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/EventRecorder.java
@@ -1,4 +1,4 @@
-package org.argeo.suite.ui;
+package org.argeo.app.ui;
 
 import org.argeo.api.cms.CmsLog;
 import org.osgi.service.event.Event;
diff --git a/org.argeo.app.ui/src/org/argeo/suite/ui/RecentItems.java b/org.argeo.app.ui/src/org/argeo/app/ui/RecentItems.java
similarity index 98%
rename from org.argeo.app.ui/src/org/argeo/suite/ui/RecentItems.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/RecentItems.java
index 66f2dc5..bad48b8 100644
--- a/org.argeo.app.ui/src/org/argeo/suite/ui/RecentItems.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/RecentItems.java
@@ -1,4 +1,4 @@
-package org.argeo.suite.ui;
+package org.argeo.app.ui;
 
 import static org.argeo.eclipse.ui.EclipseUiUtils.notEmpty;
 
@@ -16,14 +16,14 @@ import javax.jcr.query.Query;
 import javax.jcr.query.QueryResult;
 
 import org.argeo.api.cms.CmsTheme;
+import org.argeo.app.api.EntityType;
+import org.argeo.app.core.XPathUtils;
+import org.argeo.app.ui.widgets.DelayedText;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.cms.ui.CmsUiProvider;
 import org.argeo.eclipse.ui.EclipseUiUtils;
-import org.argeo.entity.EntityType;
 import org.argeo.jcr.Jcr;
 import org.argeo.jcr.JcrUtils;
-import org.argeo.suite.ui.widgets.DelayedText;
-import org.argeo.suite.util.XPathUtils;
 import org.eclipse.jface.layout.TableColumnLayout;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.ColumnWeightData;
diff --git a/org.argeo.app.ui/src/org/argeo/suite/ui/SuiteApp.java b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java
similarity index 98%
rename from org.argeo.app.ui/src/org/argeo/suite/ui/SuiteApp.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java
index 118555a..7070ed5 100644
--- a/org.argeo.app.ui/src/org/argeo/suite/ui/SuiteApp.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java
@@ -1,4 +1,4 @@
-package org.argeo.suite.ui;
+package org.argeo.app.ui;
 
 import static org.argeo.api.cms.CmsView.CMS_VIEW_UID_PROPERTY;
 
@@ -25,6 +25,11 @@ import org.argeo.api.cms.CmsSession;
 import org.argeo.api.cms.CmsTheme;
 import org.argeo.api.cms.CmsUi;
 import org.argeo.api.cms.CmsView;
+import org.argeo.app.api.EntityConstants;
+import org.argeo.app.api.EntityNames;
+import org.argeo.app.api.EntityType;
+import org.argeo.app.api.RankedObject;
+import org.argeo.app.core.SuiteUtils;
 import org.argeo.api.cms.CmsLog;
 import org.argeo.cms.AbstractCmsApp;
 import org.argeo.cms.CmsUserManager;
@@ -35,13 +40,8 @@ import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.cms.swt.dialogs.CmsFeedback;
 import org.argeo.cms.ui.CmsUiProvider;
 import org.argeo.eclipse.ui.specific.UiContext;
-import org.argeo.entity.EntityConstants;
-import org.argeo.entity.EntityNames;
-import org.argeo.entity.EntityType;
 import org.argeo.jcr.Jcr;
 import org.argeo.jcr.JcrException;
-import org.argeo.suite.RankedObject;
-import org.argeo.suite.SuiteUtils;
 import org.argeo.util.LangUtils;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
diff --git a/org.argeo.app.ui/src/org/argeo/suite/ui/SuiteEvent.java b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteEvent.java
similarity index 97%
rename from org.argeo.app.ui/src/org/argeo/suite/ui/SuiteEvent.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/SuiteEvent.java
index 9963856..6eaa607 100644
--- a/org.argeo.app.ui/src/org/argeo/suite/ui/SuiteEvent.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteEvent.java
@@ -1,4 +1,4 @@
-package org.argeo.suite.ui;
+package org.argeo.app.ui;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/org.argeo.app.ui/src/org/argeo/suite/ui/SuiteIcon.java b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteIcon.java
similarity index 92%
rename from org.argeo.app.ui/src/org/argeo/suite/ui/SuiteIcon.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/SuiteIcon.java
index b4cc1bb..bfc92c3 100644
--- a/org.argeo.app.ui/src/org/argeo/suite/ui/SuiteIcon.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteIcon.java
@@ -1,4 +1,4 @@
-package org.argeo.suite.ui;
+package org.argeo.app.ui;
 
 import org.argeo.cms.swt.CmsIcon;
 
diff --git a/org.argeo.app.ui/src/org/argeo/suite/ui/SuiteLayer.java b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteLayer.java
similarity index 95%
rename from org.argeo.app.ui/src/org/argeo/suite/ui/SuiteLayer.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/SuiteLayer.java
index d18192f..a92994f 100644
--- a/org.argeo.app.ui/src/org/argeo/suite/ui/SuiteLayer.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteLayer.java
@@ -1,4 +1,4 @@
-package org.argeo.suite.ui;
+package org.argeo.app.ui;
 
 import javax.jcr.Node;
 
diff --git a/org.argeo.app.ui/src/org/argeo/suite/ui/SuiteMsg.java b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteMsg.java
similarity index 97%
rename from org.argeo.app.ui/src/org/argeo/suite/ui/SuiteMsg.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/SuiteMsg.java
index 3b376db..fae15df 100644
--- a/org.argeo.app.ui/src/org/argeo/suite/ui/SuiteMsg.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteMsg.java
@@ -1,4 +1,4 @@
-package org.argeo.suite.ui;
+package org.argeo.app.ui;
 
 import org.argeo.cms.Localized;
 
diff --git a/org.argeo.app.ui/src/org/argeo/suite/ui/SuiteStyle.java b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteStyle.java
similarity index 96%
rename from org.argeo.app.ui/src/org/argeo/suite/ui/SuiteStyle.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/SuiteStyle.java
index 345ae30..7afd23c 100644
--- a/org.argeo.app.ui/src/org/argeo/suite/ui/SuiteStyle.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteStyle.java
@@ -1,4 +1,4 @@
-package org.argeo.suite.ui;
+package org.argeo.app.ui;
 
 import org.argeo.api.cms.CmsStyle;
 
diff --git a/org.argeo.app.ui/src/org/argeo/suite/ui/SuiteUi.java b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteUi.java
similarity index 99%
rename from org.argeo.app.ui/src/org/argeo/suite/ui/SuiteUi.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/SuiteUi.java
index dc2ef50..b2e4385 100644
--- a/org.argeo.app.ui/src/org/argeo/suite/ui/SuiteUi.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteUi.java
@@ -1,4 +1,4 @@
-package org.argeo.suite.ui;
+package org.argeo.app.ui;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/org.argeo.app.ui/src/org/argeo/suite/ui/SuiteUiUtils.java b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteUiUtils.java
similarity index 99%
rename from org.argeo.app.ui/src/org/argeo/suite/ui/SuiteUiUtils.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/SuiteUiUtils.java
index 21d8d93..cad9bdd 100644
--- a/org.argeo.app.ui/src/org/argeo/suite/ui/SuiteUiUtils.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteUiUtils.java
@@ -1,4 +1,4 @@
-package org.argeo.suite.ui;
+package org.argeo.app.ui;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -12,6 +12,9 @@ import org.argeo.api.cms.CmsEvent;
 import org.argeo.api.cms.CmsStyle;
 import org.argeo.api.cms.CmsTheme;
 import org.argeo.api.cms.CmsView;
+import org.argeo.app.api.EntityNames;
+import org.argeo.app.api.EntityType;
+import org.argeo.app.api.SuiteRole;
 import org.argeo.cms.LocaleUtils;
 import org.argeo.cms.Localized;
 import org.argeo.cms.auth.CurrentUser;
@@ -21,12 +24,9 @@ import org.argeo.cms.swt.dialogs.LightweightDialog;
 import org.argeo.cms.ui.util.CmsLink;
 import org.argeo.cms.ui.util.CmsUiUtils;
 import org.argeo.eclipse.ui.EclipseUiUtils;
-import org.argeo.entity.EntityNames;
-import org.argeo.entity.EntityType;
 import org.argeo.jcr.Jcr;
 import org.argeo.jcr.JcrException;
 import org.argeo.jcr.JcrUtils;
-import org.argeo.suite.SuiteRole;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.ScrolledComposite;
 import org.eclipse.swt.events.MouseEvent;
diff --git a/org.argeo.app.ui/src/org/argeo/suite/ui/TermsEntryArea.java b/org.argeo.app.ui/src/org/argeo/app/ui/TermsEntryArea.java
similarity index 95%
rename from org.argeo.app.ui/src/org/argeo/suite/ui/TermsEntryArea.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/TermsEntryArea.java
index 0f7e927..97d8c1f 100644
--- a/org.argeo.app.ui/src/org/argeo/suite/ui/TermsEntryArea.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/TermsEntryArea.java
@@ -1,4 +1,4 @@
-package org.argeo.suite.ui;
+package org.argeo.app.ui;
 
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
diff --git a/org.argeo.app.ui/src/org/argeo/suite/ui/dialogs/NewPersonPage.java b/org.argeo.app.ui/src/org/argeo/app/ui/dialogs/NewPersonPage.java
similarity index 95%
rename from org.argeo.app.ui/src/org/argeo/suite/ui/dialogs/NewPersonPage.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/dialogs/NewPersonPage.java
index ddd4488..380330f 100644
--- a/org.argeo.app.ui/src/org/argeo/suite/ui/dialogs/NewPersonPage.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/dialogs/NewPersonPage.java
@@ -1,7 +1,7 @@
-package org.argeo.suite.ui.dialogs;
+package org.argeo.app.ui.dialogs;
 
-import org.argeo.suite.ui.SuiteMsg;
-import org.argeo.suite.ui.SuiteUiUtils;
+import org.argeo.app.ui.SuiteMsg;
+import org.argeo.app.ui.SuiteUiUtils;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
diff --git a/org.argeo.app.ui/src/org/argeo/suite/ui/dialogs/NewPersonWizard.java b/org.argeo.app.ui/src/org/argeo/app/ui/dialogs/NewPersonWizard.java
similarity index 97%
rename from org.argeo.app.ui/src/org/argeo/suite/ui/dialogs/NewPersonWizard.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/dialogs/NewPersonWizard.java
index 9db5e04..ee9f5b9 100644
--- a/org.argeo.app.ui/src/org/argeo/suite/ui/dialogs/NewPersonWizard.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/dialogs/NewPersonWizard.java
@@ -1,12 +1,12 @@
-package org.argeo.suite.ui.dialogs;
+package org.argeo.app.ui.dialogs;
 
 import static org.argeo.eclipse.ui.EclipseUiUtils.isEmpty;
 
 import javax.jcr.Node;
 
+import org.argeo.app.ui.SuiteMsg;
+import org.argeo.app.ui.SuiteUiUtils;
 import org.argeo.eclipse.ui.EclipseUiUtils;
-import org.argeo.suite.ui.SuiteMsg;
-import org.argeo.suite.ui.SuiteUiUtils;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.jface.wizard.WizardPage;
diff --git a/org.argeo.app.ui/src/org/argeo/suite/ui/dialogs/NewUserWizard.java b/org.argeo.app.ui/src/org/argeo/app/ui/dialogs/NewUserWizard.java
similarity index 97%
rename from org.argeo.app.ui/src/org/argeo/suite/ui/dialogs/NewUserWizard.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/dialogs/NewUserWizard.java
index 5b4575d..2071872 100644
--- a/org.argeo.app.ui/src/org/argeo/suite/ui/dialogs/NewUserWizard.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/dialogs/NewUserWizard.java
@@ -1,12 +1,12 @@
-package org.argeo.suite.ui.dialogs;
+package org.argeo.app.ui.dialogs;
 
 import static org.argeo.eclipse.ui.EclipseUiUtils.isEmpty;
 
 import javax.jcr.Node;
 
+import org.argeo.app.ui.SuiteMsg;
+import org.argeo.app.ui.SuiteUiUtils;
 import org.argeo.eclipse.ui.EclipseUiUtils;
-import org.argeo.suite.ui.SuiteMsg;
-import org.argeo.suite.ui.SuiteUiUtils;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.jface.wizard.WizardPage;
diff --git a/org.argeo.app.ui/src/org/argeo/docbook/ui/AbstractDbkViewer.java b/org.argeo.app.ui/src/org/argeo/app/ui/docbook/AbstractDbkViewer.java
similarity index 99%
rename from org.argeo.app.ui/src/org/argeo/docbook/ui/AbstractDbkViewer.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/docbook/AbstractDbkViewer.java
index c9e2183..5012805 100644
--- a/org.argeo.app.ui/src/org/argeo/docbook/ui/AbstractDbkViewer.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/docbook/AbstractDbkViewer.java
@@ -1,8 +1,8 @@
-package org.argeo.docbook.ui;
+package org.argeo.app.ui.docbook;
 
-import static org.argeo.docbook.DbkType.para;
-import static org.argeo.docbook.DbkUtils.addDbk;
-import static org.argeo.docbook.DbkUtils.isDbk;
+import static org.argeo.app.docbook.DbkType.para;
+import static org.argeo.app.docbook.DbkUtils.addDbk;
+import static org.argeo.app.docbook.DbkUtils.isDbk;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -19,6 +19,9 @@ import javax.jcr.Session;
 import org.argeo.api.cms.Cms2DSize;
 import org.argeo.api.cms.CmsEditable;
 import org.argeo.api.cms.CmsLog;
+import org.argeo.app.docbook.DbkAttr;
+import org.argeo.app.docbook.DbkType;
+import org.argeo.app.docbook.DbkUtils;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.cms.ui.viewers.AbstractPageViewer;
 import org.argeo.cms.ui.viewers.EditablePart;
@@ -28,9 +31,6 @@ import org.argeo.cms.ui.viewers.Section;
 import org.argeo.cms.ui.viewers.SectionPart;
 import org.argeo.cms.ui.widgets.EditableText;
 import org.argeo.cms.ui.widgets.StyledControl;
-import org.argeo.docbook.DbkAttr;
-import org.argeo.docbook.DbkType;
-import org.argeo.docbook.DbkUtils;
 import org.argeo.jcr.Jcr;
 import org.argeo.jcr.JcrException;
 import org.argeo.jcr.JcrUtils;
diff --git a/org.argeo.app.ui/src/org/argeo/docbook/ui/CustomDbkEditor.java b/org.argeo.app.ui/src/org/argeo/app/ui/docbook/CustomDbkEditor.java
similarity index 95%
rename from org.argeo.app.ui/src/org/argeo/docbook/ui/CustomDbkEditor.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/docbook/CustomDbkEditor.java
index 94c9825..16845ae 100644
--- a/org.argeo.app.ui/src/org/argeo/docbook/ui/CustomDbkEditor.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/docbook/CustomDbkEditor.java
@@ -1,4 +1,4 @@
-package org.argeo.docbook.ui;
+package org.argeo.app.ui.docbook;
 
 import javax.jcr.Node;
 
diff --git a/org.argeo.app.ui/src/org/argeo/docbook/ui/DbkContextMenu.java b/org.argeo.app.ui/src/org/argeo/app/ui/docbook/DbkContextMenu.java
similarity index 98%
rename from org.argeo.app.ui/src/org/argeo/docbook/ui/DbkContextMenu.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/docbook/DbkContextMenu.java
index 778f7c8..cf45ef9 100644
--- a/org.argeo.app.ui/src/org/argeo/docbook/ui/DbkContextMenu.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/docbook/DbkContextMenu.java
@@ -1,4 +1,4 @@
-package org.argeo.docbook.ui;
+package org.argeo.app.ui.docbook;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -6,6 +6,8 @@ import java.util.List;
 import javax.jcr.Node;
 
 import org.argeo.api.cms.CmsEditable;
+import org.argeo.app.docbook.DbkMsg;
+import org.argeo.app.docbook.DbkUtils;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.cms.swt.MouseDown;
 import org.argeo.cms.ui.viewers.EditablePart;
@@ -14,8 +16,6 @@ import org.argeo.cms.ui.viewers.Section;
 import org.argeo.cms.ui.viewers.SectionPart;
 import org.argeo.cms.ui.widgets.EditableText;
 import org.argeo.cms.ui.widgets.Img;
-import org.argeo.docbook.DbkMsg;
-import org.argeo.docbook.DbkUtils;
 import org.argeo.jcr.Jcr;
 import org.eclipse.rap.rwt.RWT;
 import org.eclipse.swt.SWT;
diff --git a/org.argeo.app.ui/src/org/argeo/docbook/ui/DbkImageManager.java b/org.argeo.app.ui/src/org/argeo/app/ui/docbook/DbkImageManager.java
similarity index 96%
rename from org.argeo.app.ui/src/org/argeo/docbook/ui/DbkImageManager.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/docbook/DbkImageManager.java
index 63f17d2..32bbdd9 100644
--- a/org.argeo.app.ui/src/org/argeo/docbook/ui/DbkImageManager.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/docbook/DbkImageManager.java
@@ -1,4 +1,4 @@
-package org.argeo.docbook.ui;
+package org.argeo.app.ui.docbook;
 
 import static javax.jcr.Node.JCR_CONTENT;
 import static javax.jcr.Property.JCR_DATA;
@@ -19,13 +19,13 @@ import javax.jcr.nodetype.NodeType;
 
 import org.argeo.api.cms.Cms2DSize;
 import org.argeo.api.cms.CmsImageManager;
+import org.argeo.app.api.EntityNames;
+import org.argeo.app.api.EntityType;
+import org.argeo.app.docbook.DbkAttr;
+import org.argeo.app.docbook.DbkType;
+import org.argeo.app.docbook.DbkUtils;
 import org.argeo.cms.ui.util.CmsUiUtils;
 import org.argeo.cms.ui.util.DefaultImageManager;
-import org.argeo.docbook.DbkAttr;
-import org.argeo.docbook.DbkType;
-import org.argeo.docbook.DbkUtils;
-import org.argeo.entity.EntityNames;
-import org.argeo.entity.EntityType;
 import org.argeo.jcr.JcrException;
 import org.argeo.jcr.JcrUtils;
 import org.eclipse.swt.graphics.ImageData;
diff --git a/org.argeo.app.ui/src/org/argeo/docbook/ui/DbkImg.java b/org.argeo.app.ui/src/org/argeo/app/ui/docbook/DbkImg.java
similarity index 98%
rename from org.argeo.app.ui/src/org/argeo/docbook/ui/DbkImg.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/docbook/DbkImg.java
index f48c626..ca9b388 100644
--- a/org.argeo.app.ui/src/org/argeo/docbook/ui/DbkImg.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/docbook/DbkImg.java
@@ -1,4 +1,4 @@
-package org.argeo.docbook.ui;
+package org.argeo.app.ui.docbook;
 
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
diff --git a/org.argeo.app.ui/src/org/argeo/docbook/ui/DbkSectionTitle.java b/org.argeo.app.ui/src/org/argeo/app/ui/docbook/DbkSectionTitle.java
similarity index 96%
rename from org.argeo.app.ui/src/org/argeo/docbook/ui/DbkSectionTitle.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/docbook/DbkSectionTitle.java
index 92fd2b8..b537333 100644
--- a/org.argeo.app.ui/src/org/argeo/docbook/ui/DbkSectionTitle.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/docbook/DbkSectionTitle.java
@@ -1,4 +1,4 @@
-package org.argeo.docbook.ui;
+package org.argeo.app.ui.docbook;
 
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
diff --git a/org.argeo.app.ui/src/org/argeo/docbook/ui/DbkTextInterpreter.java b/org.argeo.app.ui/src/org/argeo/app/ui/docbook/DbkTextInterpreter.java
similarity index 97%
rename from org.argeo.app.ui/src/org/argeo/docbook/ui/DbkTextInterpreter.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/docbook/DbkTextInterpreter.java
index c853535..ff12348 100644
--- a/org.argeo.app.ui/src/org/argeo/docbook/ui/DbkTextInterpreter.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/docbook/DbkTextInterpreter.java
@@ -1,8 +1,8 @@
-package org.argeo.docbook.ui;
+package org.argeo.app.ui.docbook;
 
-import static org.argeo.docbook.DbkType.para;
-import static org.argeo.docbook.DbkType.title;
-import static org.argeo.docbook.DbkUtils.isDbk;
+import static org.argeo.app.docbook.DbkType.para;
+import static org.argeo.app.docbook.DbkType.title;
+import static org.argeo.app.docbook.DbkUtils.isDbk;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -21,8 +21,8 @@ import javax.jcr.RepositoryException;
 import javax.xml.parsers.DocumentBuilderFactory;
 
 import org.apache.commons.io.IOUtils;
-import org.argeo.docbook.DbkAttr;
-import org.argeo.docbook.DbkType;
+import org.argeo.app.docbook.DbkAttr;
+import org.argeo.app.docbook.DbkType;
 import org.argeo.jcr.Jcr;
 import org.argeo.jcr.JcrException;
 
diff --git a/org.argeo.app.ui/src/org/argeo/docbook/ui/DbkVideo.java b/org.argeo.app.ui/src/org/argeo/app/ui/docbook/DbkVideo.java
similarity index 97%
rename from org.argeo.app.ui/src/org/argeo/docbook/ui/DbkVideo.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/docbook/DbkVideo.java
index ed7976a..c8aee51 100644
--- a/org.argeo.app.ui/src/org/argeo/docbook/ui/DbkVideo.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/docbook/DbkVideo.java
@@ -1,4 +1,4 @@
-package org.argeo.docbook.ui;
+package org.argeo.app.ui.docbook;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -9,15 +9,15 @@ import javax.jcr.Item;
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
+import org.argeo.app.docbook.DbkAttr;
+import org.argeo.app.docbook.DbkType;
+import org.argeo.app.docbook.DbkUtils;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.cms.swt.Selected;
 import org.argeo.cms.ui.viewers.NodePart;
 import org.argeo.cms.ui.viewers.Section;
 import org.argeo.cms.ui.viewers.SectionPart;
 import org.argeo.cms.ui.widgets.StyledControl;
-import org.argeo.docbook.DbkAttr;
-import org.argeo.docbook.DbkType;
-import org.argeo.docbook.DbkUtils;
 import org.argeo.jcr.Jcr;
 import org.argeo.jcr.JcrException;
 import org.argeo.util.naming.NamingUtils;
diff --git a/org.argeo.app.ui/src/org/argeo/docbook/ui/DocumentPage.java b/org.argeo.app.ui/src/org/argeo/app/ui/docbook/DocumentPage.java
similarity index 96%
rename from org.argeo.app.ui/src/org/argeo/docbook/ui/DocumentPage.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/docbook/DocumentPage.java
index f568611..8aba8b7 100644
--- a/org.argeo.app.ui/src/org/argeo/docbook/ui/DocumentPage.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/docbook/DocumentPage.java
@@ -1,4 +1,4 @@
-package org.argeo.docbook.ui;
+package org.argeo.app.ui.docbook;
 
 import javax.jcr.Node;
 import javax.jcr.NodeIterator;
@@ -7,12 +7,12 @@ import javax.jcr.Session;
 import javax.jcr.nodetype.NodeType;
 
 import org.argeo.api.cms.CmsEditable;
+import org.argeo.app.docbook.DbkType;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.cms.ui.CmsUiProvider;
 import org.argeo.cms.ui.util.CmsLink;
 import org.argeo.cms.ui.viewers.JcrVersionCmsEditable;
 import org.argeo.cms.ui.widgets.ScrolledPage;
-import org.argeo.docbook.DbkType;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
diff --git a/org.argeo.app.ui/src/org/argeo/docbook/ui/DocumentTextEditor.java b/org.argeo.app.ui/src/org/argeo/app/ui/docbook/DocumentTextEditor.java
similarity index 90%
rename from org.argeo.app.ui/src/org/argeo/docbook/ui/DocumentTextEditor.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/docbook/DocumentTextEditor.java
index 9ffef2b..8f3a10c 100644
--- a/org.argeo.app.ui/src/org/argeo/docbook/ui/DocumentTextEditor.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/docbook/DocumentTextEditor.java
@@ -1,12 +1,12 @@
-package org.argeo.docbook.ui;
+package org.argeo.app.ui.docbook;
 
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
 import org.argeo.api.cms.CmsEditable;
+import org.argeo.app.docbook.DbkType;
+import org.argeo.app.docbook.DbkUtils;
 import org.argeo.cms.swt.CmsSwtUtils;
-import org.argeo.docbook.DbkUtils;
-import org.argeo.docbook.DbkType;
 import org.eclipse.swt.widgets.Composite;
 
 /** Text editor where sections and subsections can be managed by the user. */
diff --git a/org.argeo.app.ui/src/org/argeo/docbook/ui/Paragraph.java b/org.argeo.app.ui/src/org/argeo/app/ui/docbook/Paragraph.java
similarity index 94%
rename from org.argeo.app.ui/src/org/argeo/docbook/ui/Paragraph.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/docbook/Paragraph.java
index 7314029..ef23d96 100644
--- a/org.argeo.app.ui/src/org/argeo/docbook/ui/Paragraph.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/docbook/Paragraph.java
@@ -1,13 +1,13 @@
-package org.argeo.docbook.ui;
+package org.argeo.app.ui.docbook;
 
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
+import org.argeo.app.docbook.DbkType;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.cms.ui.viewers.SectionPart;
 import org.argeo.cms.ui.widgets.EditableText;
 import org.argeo.cms.ui.widgets.TextStyles;
-import org.argeo.docbook.DbkType;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 
diff --git a/org.argeo.app.ui/src/org/argeo/docbook/ui/TextEditorHeader.java b/org.argeo.app.ui/src/org/argeo/app/ui/docbook/TextEditorHeader.java
similarity index 98%
rename from org.argeo.app.ui/src/org/argeo/docbook/ui/TextEditorHeader.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/docbook/TextEditorHeader.java
index b430de0..31251aa 100644
--- a/org.argeo.app.ui/src/org/argeo/docbook/ui/TextEditorHeader.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/docbook/TextEditorHeader.java
@@ -1,4 +1,4 @@
-package org.argeo.docbook.ui;
+package org.argeo.app.ui.docbook;
 
 import java.util.Observable;
 import java.util.Observer;
diff --git a/org.argeo.app.ui/src/org/argeo/docbook/ui/TextInterpreter.java b/org.argeo.app.ui/src/org/argeo/app/ui/docbook/TextInterpreter.java
similarity index 88%
rename from org.argeo.app.ui/src/org/argeo/docbook/ui/TextInterpreter.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/docbook/TextInterpreter.java
index 785d71e..9da2f6f 100644
--- a/org.argeo.app.ui/src/org/argeo/docbook/ui/TextInterpreter.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/docbook/TextInterpreter.java
@@ -1,4 +1,4 @@
-package org.argeo.docbook.ui;
+package org.argeo.app.ui.docbook;
 
 import javax.jcr.Item;
 
diff --git a/org.argeo.app.ui/src/org/argeo/docbook/ui/TextSection.java b/org.argeo.app.ui/src/org/argeo/app/ui/docbook/TextSection.java
similarity index 96%
rename from org.argeo.app.ui/src/org/argeo/docbook/ui/TextSection.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/docbook/TextSection.java
index b8c82d7..3967834 100644
--- a/org.argeo.app.ui/src/org/argeo/docbook/ui/TextSection.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/docbook/TextSection.java
@@ -1,12 +1,12 @@
-package org.argeo.docbook.ui;
+package org.argeo.app.ui.docbook;
 
 import javax.jcr.Node;
 
+import org.argeo.app.docbook.DbkType;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.cms.ui.viewers.EditablePart;
 import org.argeo.cms.ui.viewers.Section;
 import org.argeo.cms.ui.widgets.TextStyles;
-import org.argeo.docbook.DbkType;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
diff --git a/org.argeo.app.ui/src/org/argeo/entity/ui/forms/AbstractTermsPart.java b/org.argeo.app.ui/src/org/argeo/app/ui/forms/AbstractTermsPart.java
similarity index 96%
rename from org.argeo.app.ui/src/org/argeo/entity/ui/forms/AbstractTermsPart.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/forms/AbstractTermsPart.java
index 973ceb2..0ce2ed1 100644
--- a/org.argeo.app.ui/src/org/argeo/entity/ui/forms/AbstractTermsPart.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/forms/AbstractTermsPart.java
@@ -1,17 +1,17 @@
-package org.argeo.entity.ui.forms;
+package org.argeo.app.ui.forms;
 
 import javax.jcr.Item;
 
 import org.argeo.api.cms.CmsTheme;
+import org.argeo.app.api.Term;
+import org.argeo.app.api.TermsManager;
+import org.argeo.app.api.Typology;
 import org.argeo.cms.Localized;
 import org.argeo.cms.swt.CmsIcon;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.cms.ui.viewers.EditablePart;
 import org.argeo.cms.ui.widgets.ContextOverlay;
 import org.argeo.cms.ui.widgets.StyledControl;
-import org.argeo.entity.Term;
-import org.argeo.entity.TermsManager;
-import org.argeo.entity.Typology;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.layout.GridData;
diff --git a/org.argeo.app.ui/src/org/argeo/entity/ui/forms/MultiTermsPart.java b/org.argeo.app.ui/src/org/argeo/app/ui/forms/MultiTermsPart.java
similarity index 98%
rename from org.argeo.app.ui/src/org/argeo/entity/ui/forms/MultiTermsPart.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/forms/MultiTermsPart.java
index e75a916..4a56b41 100644
--- a/org.argeo.app.ui/src/org/argeo/entity/ui/forms/MultiTermsPart.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/forms/MultiTermsPart.java
@@ -1,4 +1,4 @@
-package org.argeo.entity.ui.forms;
+package org.argeo.app.ui.forms;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -6,6 +6,8 @@ import java.util.List;
 import javax.jcr.Item;
 
 import org.argeo.api.cms.CmsLog;
+import org.argeo.app.api.Term;
+import org.argeo.app.api.TermsManager;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.cms.swt.MouseDoubleClick;
 import org.argeo.cms.swt.MouseDown;
@@ -13,8 +15,6 @@ import org.argeo.cms.swt.Selected;
 import org.argeo.cms.ui.forms.FormStyle;
 import org.argeo.cms.ui.viewers.EditablePart;
 import org.argeo.cms.ui.widgets.ContextOverlay;
-import org.argeo.entity.Term;
-import org.argeo.entity.TermsManager;
 import org.argeo.jcr.Jcr;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.FocusEvent;
diff --git a/org.argeo.app.ui/src/org/argeo/entity/ui/forms/SingleTermPart.java b/org.argeo.app.ui/src/org/argeo/app/ui/forms/SingleTermPart.java
similarity index 97%
rename from org.argeo.app.ui/src/org/argeo/entity/ui/forms/SingleTermPart.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/forms/SingleTermPart.java
index da23819..4a5aa8d 100644
--- a/org.argeo.app.ui/src/org/argeo/entity/ui/forms/SingleTermPart.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/forms/SingleTermPart.java
@@ -1,9 +1,11 @@
-package org.argeo.entity.ui.forms;
+package org.argeo.app.ui.forms;
 
 import java.util.List;
 
 import javax.jcr.Item;
 
+import org.argeo.app.api.Term;
+import org.argeo.app.api.TermsManager;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.cms.swt.MouseDoubleClick;
 import org.argeo.cms.swt.MouseDown;
@@ -11,8 +13,6 @@ import org.argeo.cms.swt.Selected;
 import org.argeo.cms.ui.forms.FormStyle;
 import org.argeo.cms.ui.viewers.EditablePart;
 import org.argeo.cms.ui.widgets.ContextOverlay;
-import org.argeo.entity.Term;
-import org.argeo.entity.TermsManager;
 import org.argeo.jcr.Jcr;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.FocusEvent;
diff --git a/org.argeo.app.ui/src/org/argeo/library/ui/ContentEntryArea.java b/org.argeo.app.ui/src/org/argeo/app/ui/library/ContentEntryArea.java
similarity index 96%
rename from org.argeo.app.ui/src/org/argeo/library/ui/ContentEntryArea.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/library/ContentEntryArea.java
index d633fed..af31ac5 100644
--- a/org.argeo.app.ui/src/org/argeo/library/ui/ContentEntryArea.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/library/ContentEntryArea.java
@@ -1,4 +1,4 @@
-package org.argeo.library.ui;
+package org.argeo.app.ui.library;
 
 import java.util.SortedMap;
 import java.util.TreeMap;
@@ -11,14 +11,14 @@ import javax.jcr.nodetype.NodeType;
 import javax.jcr.query.Query;
 
 import org.argeo.api.cms.CmsTheme;
+import org.argeo.app.api.EntityType;
+import org.argeo.app.ui.SuiteEvent;
+import org.argeo.app.ui.SuiteIcon;
+import org.argeo.app.ui.widgets.TreeOrSearchArea;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.cms.ui.CmsUiProvider;
-import org.argeo.entity.EntityType;
 import org.argeo.jcr.Jcr;
 import org.argeo.jcr.JcrException;
-import org.argeo.suite.ui.SuiteEvent;
-import org.argeo.suite.ui.SuiteIcon;
-import org.argeo.suite.ui.widgets.TreeOrSearchArea;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
diff --git a/org.argeo.app.ui/src/org/argeo/library/ui/DocumentsContextMenu.java b/org.argeo.app.ui/src/org/argeo/app/ui/library/DocumentsContextMenu.java
similarity index 89%
rename from org.argeo.app.ui/src/org/argeo/library/ui/DocumentsContextMenu.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/library/DocumentsContextMenu.java
index 03de251..82a21c1 100644
--- a/org.argeo.app.ui/src/org/argeo/library/ui/DocumentsContextMenu.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/library/DocumentsContextMenu.java
@@ -1,17 +1,17 @@
-package org.argeo.library.ui;
+package org.argeo.app.ui.library;
 
-import static org.argeo.library.ui.DocumentsUiService.ACTION_ID_BOOKMARK_FOLDER;
-import static org.argeo.library.ui.DocumentsUiService.ACTION_ID_CREATE_FOLDER;
-import static org.argeo.library.ui.DocumentsUiService.ACTION_ID_DELETE;
-import static org.argeo.library.ui.DocumentsUiService.ACTION_ID_DOWNLOAD_FOLDER;
-import static org.argeo.library.ui.DocumentsUiService.ACTION_ID_RENAME;
-import static org.argeo.library.ui.DocumentsUiService.ACTION_ID_SHARE_FOLDER;
-import static org.argeo.library.ui.DocumentsUiService.ACTION_ID_UPLOAD_FILE;
+import static org.argeo.app.ui.library.DocumentsUiService.ACTION_ID_BOOKMARK_FOLDER;
+import static org.argeo.app.ui.library.DocumentsUiService.ACTION_ID_CREATE_FOLDER;
+import static org.argeo.app.ui.library.DocumentsUiService.ACTION_ID_DELETE;
+import static org.argeo.app.ui.library.DocumentsUiService.ACTION_ID_DOWNLOAD_FOLDER;
+import static org.argeo.app.ui.library.DocumentsUiService.ACTION_ID_RENAME;
+import static org.argeo.app.ui.library.DocumentsUiService.ACTION_ID_SHARE_FOLDER;
+import static org.argeo.app.ui.library.DocumentsUiService.ACTION_ID_UPLOAD_FILE;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
 
-import org.argeo.suite.ui.widgets.AbstractConnectContextMenu;
+import org.argeo.app.ui.widgets.AbstractConnectContextMenu;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.widgets.Control;
diff --git a/org.argeo.app.ui/src/org/argeo/library/ui/DocumentsFileComposite.java b/org.argeo.app.ui/src/org/argeo/app/ui/library/DocumentsFileComposite.java
similarity index 99%
rename from org.argeo.app.ui/src/org/argeo/library/ui/DocumentsFileComposite.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/library/DocumentsFileComposite.java
index c9f4889..d4b70bb 100644
--- a/org.argeo.app.ui/src/org/argeo/library/ui/DocumentsFileComposite.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/library/DocumentsFileComposite.java
@@ -1,4 +1,4 @@
-package org.argeo.library.ui;
+package org.argeo.app.ui.library;
 
 import java.io.IOException;
 import java.nio.file.Files;
diff --git a/org.argeo.app.ui/src/org/argeo/library/ui/DocumentsFolderComposite.java b/org.argeo.app.ui/src/org/argeo/app/ui/library/DocumentsFolderComposite.java
similarity index 99%
rename from org.argeo.app.ui/src/org/argeo/library/ui/DocumentsFolderComposite.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/library/DocumentsFolderComposite.java
index b9709e6..58ceed6 100644
--- a/org.argeo.app.ui/src/org/argeo/library/ui/DocumentsFolderComposite.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/library/DocumentsFolderComposite.java
@@ -1,4 +1,4 @@
-package org.argeo.library.ui;
+package org.argeo.app.ui.library;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/org.argeo.app.ui/src/org/argeo/library/ui/DocumentsFolderUiProvider.java b/org.argeo.app.ui/src/org/argeo/app/ui/library/DocumentsFolderUiProvider.java
similarity index 95%
rename from org.argeo.app.ui/src/org/argeo/library/ui/DocumentsFolderUiProvider.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/library/DocumentsFolderUiProvider.java
index 41fc823..781b862 100644
--- a/org.argeo.app.ui/src/org/argeo/library/ui/DocumentsFolderUiProvider.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/library/DocumentsFolderUiProvider.java
@@ -1,4 +1,4 @@
-package org.argeo.library.ui;
+package org.argeo.app.ui.library;
 
 import java.nio.file.Path;
 import java.nio.file.spi.FileSystemProvider;
@@ -7,11 +7,11 @@ import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
 import org.argeo.api.cms.CmsView;
+import org.argeo.app.ui.SuiteEvent;
 import org.argeo.cms.fs.CmsFsUtils;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.cms.ui.CmsUiProvider;
 import org.argeo.jcr.Jcr;
-import org.argeo.suite.ui.SuiteEvent;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
diff --git a/org.argeo.app.ui/src/org/argeo/library/ui/DocumentsTreeUiProvider.java b/org.argeo.app.ui/src/org/argeo/app/ui/library/DocumentsTreeUiProvider.java
similarity index 97%
rename from org.argeo.app.ui/src/org/argeo/library/ui/DocumentsTreeUiProvider.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/library/DocumentsTreeUiProvider.java
index b2483a9..1c82396 100644
--- a/org.argeo.app.ui/src/org/argeo/library/ui/DocumentsTreeUiProvider.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/library/DocumentsTreeUiProvider.java
@@ -1,4 +1,4 @@
-package org.argeo.library.ui;
+package org.argeo.app.ui.library;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -9,6 +9,7 @@ import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 
 import org.argeo.api.cms.CmsView;
+import org.argeo.app.ui.SuiteEvent;
 import org.argeo.api.cms.CmsConstants;
 import org.argeo.cms.fs.CmsFsUtils;
 import org.argeo.cms.jcr.CmsJcrUtils;
@@ -16,7 +17,6 @@ import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.cms.ui.CmsUiProvider;
 import org.argeo.eclipse.ui.fs.FsTreeViewer;
 import org.argeo.jcr.Jcr;
-import org.argeo.suite.ui.SuiteEvent;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridLayout;
diff --git a/org.argeo.app.ui/src/org/argeo/library/ui/DocumentsUiService.java b/org.argeo.app.ui/src/org/argeo/app/ui/library/DocumentsUiService.java
similarity index 99%
rename from org.argeo.app.ui/src/org/argeo/library/ui/DocumentsUiService.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/library/DocumentsUiService.java
index 9084e86..6cbe4ae 100644
--- a/org.argeo.app.ui/src/org/argeo/library/ui/DocumentsUiService.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/library/DocumentsUiService.java
@@ -1,4 +1,4 @@
-package org.argeo.library.ui;
+package org.argeo.app.ui.library;
 
 import static org.argeo.cms.swt.dialogs.CmsMessageDialog.openConfirm;
 import static org.argeo.cms.swt.dialogs.CmsMessageDialog.openError;
diff --git a/org.argeo.app.ui/src/org/argeo/support/openlayers/OLMap.java b/org.argeo.app.ui/src/org/argeo/app/ui/openlayers/OLMap.java
similarity index 93%
rename from org.argeo.app.ui/src/org/argeo/support/openlayers/OLMap.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/openlayers/OLMap.java
index 3bcf488..1301325 100644
--- a/org.argeo.app.ui/src/org/argeo/support/openlayers/OLMap.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/openlayers/OLMap.java
@@ -1,4 +1,4 @@
-package org.argeo.support.openlayers;
+package org.argeo.app.ui.openlayers;
 
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.eclipse.swt.SWT;
diff --git a/org.argeo.app.ui/src/org/argeo/support/openlayers/OpenLayersMap.java b/org.argeo.app.ui/src/org/argeo/app/ui/openlayers/OpenLayersMap.java
similarity index 98%
rename from org.argeo.app.ui/src/org/argeo/support/openlayers/OpenLayersMap.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/openlayers/OpenLayersMap.java
index dac7bea..d755e8b 100644
--- a/org.argeo.app.ui/src/org/argeo/support/openlayers/OpenLayersMap.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/openlayers/OpenLayersMap.java
@@ -1,4 +1,4 @@
-package org.argeo.support.openlayers;
+package org.argeo.app.ui.openlayers;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -14,12 +14,12 @@ import javax.jcr.RepositoryException;
 
 import org.apache.commons.io.IOUtils;
 import org.argeo.api.cms.CmsView;
+import org.argeo.app.api.EntityNames;
+import org.argeo.app.api.EntityType;
+import org.argeo.app.ui.SuiteEvent;
 import org.argeo.api.cms.CmsLog;
 import org.argeo.api.cms.CmsConstants;
 import org.argeo.cms.swt.CmsSwtUtils;
-import org.argeo.entity.EntityNames;
-import org.argeo.entity.EntityType;
-import org.argeo.suite.ui.SuiteEvent;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.browser.Browser;
 import org.eclipse.swt.browser.BrowserFunction;
diff --git a/org.argeo.app.ui/src/org/argeo/support/openlayers/OverviewMap.java b/org.argeo.app.ui/src/org/argeo/app/ui/openlayers/OverviewMap.java
similarity index 96%
rename from org.argeo.app.ui/src/org/argeo/support/openlayers/OverviewMap.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/openlayers/OverviewMap.java
index 11d92e1..dbb3119 100644
--- a/org.argeo.app.ui/src/org/argeo/support/openlayers/OverviewMap.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/openlayers/OverviewMap.java
@@ -1,4 +1,4 @@
-package org.argeo.support.openlayers;
+package org.argeo.app.ui.openlayers;
 
 import java.util.List;
 
@@ -9,9 +9,9 @@ import javax.jcr.observation.EventIterator;
 import javax.jcr.observation.EventListener;
 import javax.jcr.query.Query;
 
+import org.argeo.app.api.EntityType;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.cms.ui.CmsUiProvider;
-import org.argeo.entity.EntityType;
 import org.argeo.jcr.JcrException;
 import org.argeo.jcr.JcrUtils;
 import org.eclipse.swt.SWT;
diff --git a/org.argeo.app.ui/src/org/argeo/support/openlayers/map-osm.html b/org.argeo.app.ui/src/org/argeo/app/ui/openlayers/map-osm.html
similarity index 100%
rename from org.argeo.app.ui/src/org/argeo/support/openlayers/map-osm.html
rename to org.argeo.app.ui/src/org/argeo/app/ui/openlayers/map-osm.html
diff --git a/org.argeo.app.ui/src/org/argeo/support/openlayers/map.js b/org.argeo.app.ui/src/org/argeo/app/ui/openlayers/map.js
similarity index 100%
rename from org.argeo.app.ui/src/org/argeo/support/openlayers/map.js
rename to org.argeo.app.ui/src/org/argeo/app/ui/openlayers/map.js
diff --git a/org.argeo.app.ui/src/org/argeo/people/ui/PeopleEntryArea.java b/org.argeo.app.ui/src/org/argeo/app/ui/people/PeopleEntryArea.java
similarity index 96%
rename from org.argeo.app.ui/src/org/argeo/people/ui/PeopleEntryArea.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/people/PeopleEntryArea.java
index 1843ea8..7e9fa6a 100644
--- a/org.argeo.app.ui/src/org/argeo/people/ui/PeopleEntryArea.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/people/PeopleEntryArea.java
@@ -1,4 +1,4 @@
-package org.argeo.people.ui;
+package org.argeo.app.ui.people;
 
 import java.util.Set;
 
@@ -6,15 +6,15 @@ import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
 import org.argeo.api.cms.CmsTheme;
+import org.argeo.app.api.SuiteRole;
+import org.argeo.app.ui.SuiteEvent;
+import org.argeo.app.ui.SuiteIcon;
+import org.argeo.app.ui.dialogs.NewUserWizard;
 import org.argeo.cms.CmsUserManager;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.cms.swt.Selected;
 import org.argeo.cms.swt.dialogs.CmsWizardDialog;
 import org.argeo.cms.ui.CmsUiProvider;
-import org.argeo.suite.SuiteRole;
-import org.argeo.suite.ui.SuiteEvent;
-import org.argeo.suite.ui.SuiteIcon;
-import org.argeo.suite.ui.dialogs.NewUserWizard;
 import org.argeo.util.naming.LdapAttrs;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.DoubleClickEvent;
diff --git a/org.argeo.app.ui/src/org/argeo/people/ui/PersonUiProvider.java b/org.argeo.app.ui/src/org/argeo/app/ui/people/PersonUiProvider.java
similarity index 96%
rename from org.argeo.app.ui/src/org/argeo/people/ui/PersonUiProvider.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/people/PersonUiProvider.java
index 8a5476d..24b0893 100644
--- a/org.argeo.app.ui/src/org/argeo/people/ui/PersonUiProvider.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/people/PersonUiProvider.java
@@ -1,4 +1,4 @@
-package org.argeo.people.ui;
+package org.argeo.app.ui.people;
 
 import java.util.Arrays;
 import java.util.List;
@@ -7,12 +7,12 @@ import java.util.Map;
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
+import org.argeo.app.ui.SuiteMsg;
+import org.argeo.app.ui.SuiteUiUtils;
 import org.argeo.cms.CmsUserManager;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.cms.ui.CmsUiProvider;
 import org.argeo.cms.ui.viewers.Section;
-import org.argeo.suite.ui.SuiteMsg;
-import org.argeo.suite.ui.SuiteUiUtils;
 import org.argeo.util.naming.LdapAttrs;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridLayout;
diff --git a/org.argeo.app.ui/src/org/argeo/people/ui/SuiteUserUiProvider.java b/org.argeo.app.ui/src/org/argeo/app/ui/people/SuiteUserUiProvider.java
similarity index 96%
rename from org.argeo.app.ui/src/org/argeo/people/ui/SuiteUserUiProvider.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/people/SuiteUserUiProvider.java
index 07c326b..6cec22d 100644
--- a/org.argeo.app.ui/src/org/argeo/people/ui/SuiteUserUiProvider.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/people/SuiteUserUiProvider.java
@@ -1,4 +1,4 @@
-package org.argeo.people.ui;
+package org.argeo.app.ui.people;
 
 import java.util.Arrays;
 import java.util.List;
@@ -7,12 +7,12 @@ import java.util.Map;
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
+import org.argeo.app.ui.SuiteMsg;
+import org.argeo.app.ui.SuiteUiUtils;
 import org.argeo.cms.CmsUserManager;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.cms.ui.CmsUiProvider;
 import org.argeo.cms.ui.viewers.Section;
-import org.argeo.suite.ui.SuiteMsg;
-import org.argeo.suite.ui.SuiteUiUtils;
 import org.argeo.util.naming.LdapAttrs;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridLayout;
diff --git a/org.argeo.app.ui/src/org/argeo/people/ui/SuiteUsersEntryArea.java b/org.argeo.app.ui/src/org/argeo/app/ui/people/SuiteUsersEntryArea.java
similarity index 96%
rename from org.argeo.app.ui/src/org/argeo/people/ui/SuiteUsersEntryArea.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/people/SuiteUsersEntryArea.java
index 6cb83d1..c6a49b6 100644
--- a/org.argeo.app.ui/src/org/argeo/people/ui/SuiteUsersEntryArea.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/people/SuiteUsersEntryArea.java
@@ -1,4 +1,4 @@
-package org.argeo.people.ui;
+package org.argeo.app.ui.people;
 
 import java.util.Set;
 
@@ -6,15 +6,15 @@ import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
 import org.argeo.api.cms.CmsTheme;
+import org.argeo.app.api.SuiteRole;
+import org.argeo.app.ui.SuiteEvent;
+import org.argeo.app.ui.SuiteIcon;
+import org.argeo.app.ui.dialogs.NewUserWizard;
 import org.argeo.cms.CmsUserManager;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.cms.swt.Selected;
 import org.argeo.cms.swt.dialogs.CmsWizardDialog;
 import org.argeo.cms.ui.CmsUiProvider;
-import org.argeo.suite.SuiteRole;
-import org.argeo.suite.ui.SuiteEvent;
-import org.argeo.suite.ui.SuiteIcon;
-import org.argeo.suite.ui.dialogs.NewUserWizard;
 import org.argeo.util.naming.LdapAttrs;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.DoubleClickEvent;
diff --git a/org.argeo.app.ui/src/org/argeo/publishing/ui/DocumentUiProvider.java b/org.argeo.app.ui/src/org/argeo/app/ui/publish/DocumentUiProvider.java
similarity index 91%
rename from org.argeo.app.ui/src/org/argeo/publishing/ui/DocumentUiProvider.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/publish/DocumentUiProvider.java
index bd331ce..3829583 100644
--- a/org.argeo.app.ui/src/org/argeo/publishing/ui/DocumentUiProvider.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/publish/DocumentUiProvider.java
@@ -1,4 +1,4 @@
-package org.argeo.publishing.ui;
+package org.argeo.app.ui.publish;
 
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
@@ -6,15 +6,15 @@ import javax.jcr.nodetype.NodeType;
 
 import org.argeo.api.cms.CmsEditable;
 import org.argeo.api.cms.CmsView;
+import org.argeo.app.docbook.DbkType;
+import org.argeo.app.ui.docbook.AbstractDbkViewer;
+import org.argeo.app.ui.docbook.DocumentTextEditor;
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.argeo.cms.ui.CmsUiProvider;
 import org.argeo.cms.ui.util.CmsLink;
 import org.argeo.cms.ui.util.CmsUiUtils;
 import org.argeo.cms.ui.viewers.JcrVersionCmsEditable;
 import org.argeo.cms.ui.widgets.ScrolledPage;
-import org.argeo.docbook.DbkType;
-import org.argeo.docbook.ui.AbstractDbkViewer;
-import org.argeo.docbook.ui.DocumentTextEditor;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.browser.Browser;
 import org.eclipse.swt.widgets.Composite;
diff --git a/org.argeo.app.ui/src/org/argeo/publishing/ui/PublishingApp.java b/org.argeo.app.ui/src/org/argeo/app/ui/publish/PublishingApp.java
similarity index 94%
rename from org.argeo.app.ui/src/org/argeo/publishing/ui/PublishingApp.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/publish/PublishingApp.java
index 464f0c9..d57706c 100644
--- a/org.argeo.app.ui/src/org/argeo/publishing/ui/PublishingApp.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/publish/PublishingApp.java
@@ -1,7 +1,7 @@
-package org.argeo.publishing.ui;
+package org.argeo.app.ui.publish;
 
-import static org.argeo.suite.ui.SuiteApp.DEFAULT_THEME_ID_PROPERTY;
-import static org.argeo.suite.ui.SuiteApp.DEFAULT_UI_NAME_PROPERTY;
+import static org.argeo.app.ui.SuiteApp.DEFAULT_THEME_ID_PROPERTY;
+import static org.argeo.app.ui.SuiteApp.DEFAULT_UI_NAME_PROPERTY;
 
 import java.util.HashSet;
 import java.util.Map;
@@ -13,11 +13,11 @@ import javax.jcr.Session;
 
 import org.argeo.api.cms.CmsApp;
 import org.argeo.api.cms.CmsUi;
+import org.argeo.app.ui.SuiteApp;
 import org.argeo.api.cms.CmsLog;
 import org.argeo.cms.AbstractCmsApp;
 import org.argeo.cms.ui.CmsUiProvider;
 import org.argeo.jcr.Jcr;
-import org.argeo.suite.ui.SuiteApp;
 import org.argeo.util.LangUtils;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
diff --git a/org.argeo.app.ui/src/org/argeo/publishing/ui/PublishingStyle.java b/org.argeo.app.ui/src/org/argeo/app/ui/publish/PublishingStyle.java
similarity index 92%
rename from org.argeo.app.ui/src/org/argeo/publishing/ui/PublishingStyle.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/publish/PublishingStyle.java
index 199d726..c2c8231 100644
--- a/org.argeo.app.ui/src/org/argeo/publishing/ui/PublishingStyle.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/publish/PublishingStyle.java
@@ -1,4 +1,4 @@
-package org.argeo.publishing.ui;
+package org.argeo.app.ui.publish;
 
 import org.argeo.api.cms.CmsStyle;
 
diff --git a/org.argeo.app.ui/src/org/argeo/suite/ui/widgets/AbstractConnectContextMenu.java b/org.argeo.app.ui/src/org/argeo/app/ui/widgets/AbstractConnectContextMenu.java
similarity index 99%
rename from org.argeo.app.ui/src/org/argeo/suite/ui/widgets/AbstractConnectContextMenu.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/widgets/AbstractConnectContextMenu.java
index 08f74e3..7824691 100644
--- a/org.argeo.app.ui/src/org/argeo/suite/ui/widgets/AbstractConnectContextMenu.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/widgets/AbstractConnectContextMenu.java
@@ -1,4 +1,4 @@
-package org.argeo.suite.ui.widgets;
+package org.argeo.app.ui.widgets;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/org.argeo.app.ui/src/org/argeo/suite/ui/widgets/ConnectAbstractDropDown.java b/org.argeo.app.ui/src/org/argeo/app/ui/widgets/ConnectAbstractDropDown.java
similarity index 99%
rename from org.argeo.app.ui/src/org/argeo/suite/ui/widgets/ConnectAbstractDropDown.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/widgets/ConnectAbstractDropDown.java
index e562fcc..d1f1a29 100644
--- a/org.argeo.app.ui/src/org/argeo/suite/ui/widgets/ConnectAbstractDropDown.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/widgets/ConnectAbstractDropDown.java
@@ -1,4 +1,4 @@
-package org.argeo.suite.ui.widgets;
+package org.argeo.app.ui.widgets;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/org.argeo.app.ui/src/org/argeo/suite/ui/widgets/DelayedText.java b/org.argeo.app.ui/src/org/argeo/app/ui/widgets/DelayedText.java
similarity index 98%
rename from org.argeo.app.ui/src/org/argeo/suite/ui/widgets/DelayedText.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/widgets/DelayedText.java
index a03c250..3b58776 100644
--- a/org.argeo.app.ui/src/org/argeo/suite/ui/widgets/DelayedText.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/widgets/DelayedText.java
@@ -1,4 +1,4 @@
-package org.argeo.suite.ui.widgets;
+package org.argeo.app.ui.widgets;
 
 import java.util.Timer;
 import java.util.TimerTask;
diff --git a/org.argeo.app.ui/src/org/argeo/suite/ui/widgets/TabbedArea.java b/org.argeo.app.ui/src/org/argeo/app/ui/widgets/TabbedArea.java
similarity index 99%
rename from org.argeo.app.ui/src/org/argeo/suite/ui/widgets/TabbedArea.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/widgets/TabbedArea.java
index 4b97b9a..c214207 100644
--- a/org.argeo.app.ui/src/org/argeo/suite/ui/widgets/TabbedArea.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/widgets/TabbedArea.java
@@ -1,4 +1,4 @@
-package org.argeo.suite.ui.widgets;
+package org.argeo.app.ui.widgets;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/org.argeo.app.ui/src/org/argeo/suite/ui/widgets/TreeOrSearchArea.java b/org.argeo.app.ui/src/org/argeo/app/ui/widgets/TreeOrSearchArea.java
similarity index 98%
rename from org.argeo.app.ui/src/org/argeo/suite/ui/widgets/TreeOrSearchArea.java
rename to org.argeo.app.ui/src/org/argeo/app/ui/widgets/TreeOrSearchArea.java
index 81cfbb7..2b8f54e 100644
--- a/org.argeo.app.ui/src/org/argeo/suite/ui/widgets/TreeOrSearchArea.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/widgets/TreeOrSearchArea.java
@@ -1,4 +1,4 @@
-package org.argeo.suite.ui.widgets;
+package org.argeo.app.ui.widgets;
 
 import org.argeo.cms.swt.CmsSwtUtils;
 import org.eclipse.jface.viewers.TreeViewer;
-- 
2.30.2