From 23b7a170cae60b500e9d45551f26b5075eba73a4 Mon Sep 17 00:00:00 2001
From: Bruno Sinou <bsinou@argeo.org>
Date: Tue, 20 Sep 2016 11:49:04 +0000
Subject: [PATCH] Clean and refactor cms.ui.workbench bundle

git-svn-id: https://svn.argeo.org/commons/trunk@9187 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../META-INF/spring/commands.xml              |   4 +-
 org.argeo.cms.ui.workbench.rap/bnd.bnd        |  10 +-
 .../security/ui/rap/RapActionBarAdvisor.java  |   2 +-
 .../security/ui/rap/commands/OpenHome.java    |   4 +-
 .../META-INF/spring/commands.xml              |  18 +--
 .../META-INF/spring/common.xml                |   4 +-
 .../META-INF/spring/parts.xml                 |  14 +--
 .../META-INF/spring/views.xml                 |   4 +-
 org.argeo.cms.ui.workbench/plugin.xml         |  94 +++++++--------
 .../ui/workbench}/JcrBrowserPerspective.java  |   6 +-
 .../ui/workbench}/MaintenancePerspective.java |  13 +--
 .../workbench}/OsgiExplorerPerspective.java   |   4 +-
 .../workbench}/SecurityAdminPerspective.java  |   6 +-
 .../ui/workbench}/UserHomePerspective.java    |   9 +-
 ...tyUiPlugin.java => WorkbenchUiPlugin.java} |   8 +-
 .../ui/workbench/commands/DoNothing.java      |   6 +-
 .../commands/OpenChangePasswordDialog.java    |   2 +-
 .../ui/workbench/commands/OpenEditor.java     |  14 +--
 .../ui/workbench/commands/OpenFile.java       |   6 +-
 .../commands/OpenHomePerspective.java         |   4 +-
 .../internal}/WorkbenchConstants.java         |   2 +-
 .../FullVersioningTreeContentProvider.java    |   2 +-
 .../jcr/GenericNodeDoubleClickListener.java   |  16 +--
 .../internal/jcr/JcrBrowserUtils.java         |  10 +-
 .../internal/jcr/NodeContentProvider.java     |   6 +-
 .../internal/jcr/NodeLabelProvider.java       |  14 +--
 .../jcr/PropertiesContentProvider.java        |   2 +-
 .../internal/jcr/PropertyLabelProvider.java   |   4 +-
 .../jcr/SingleNodeAsTreeContentProvider.java  |   2 +-
 .../internal/jcr/VersionLabelProvider.java    |   2 +-
 .../internal/jcr}/commands/AddFolderNode.java |  14 +--
 .../internal/jcr}/commands/AddPrivileges.java |  12 +-
 .../jcr}/commands/AddRemoteRepository.java    |   6 +-
 .../jcr}/commands/CreateWorkspace.java        |  10 +-
 .../internal/jcr}/commands/DeleteNodes.java   |   8 +-
 .../internal/jcr}/commands/DumpNode.java      |  11 +-
 .../internal/jcr}/commands/EditNode.java      |   4 +-
 .../internal/jcr}/commands/GetNodeSize.java   |  10 +-
 .../jcr}/commands/ImportFileSystem.java       |  14 +--
 .../jcr}/commands/NodeConfigurableDump.java   |   8 +-
 .../internal/jcr}/commands/Refresh.java       |  14 +--
 .../jcr}/commands/RemovePrivileges.java       |  12 +-
 .../jcr}/commands/RemoveRemoteRepository.java |   6 +-
 .../internal/jcr}/commands/RenameNode.java    |  10 +-
 .../jcr}/commands/SortChildNodes.java         |   8 +-
 .../jcr/model/MaintainedRepositoryElem.java   |   2 +-
 .../jcr/model/RemoteRepositoryElem.java       |   2 +-
 .../internal/jcr/model/RepositoriesElem.java  |   2 +-
 .../internal/jcr/model/RepositoryElem.java    |   2 +-
 .../internal/jcr/model/SingleJcrNodeElem.java |   2 +-
 .../internal/jcr/model/WorkspaceElem.java     |   2 +-
 .../jcr/parts/AbstractJcrQueryEditor.java     |   2 +-
 .../jcr/parts/AddPrivilegeWizard.java         |   6 +-
 .../internal/jcr/parts/ChildNodesPage.java    |  16 +--
 .../internal/jcr/parts/ChooseNameDialog.java  |   2 +-
 .../internal/jcr/parts/EmptyNodePage.java     |   2 +-
 .../jcr/parts/GenericNodeEditorInput.java     |   2 +-
 .../internal/jcr/parts/GenericNodePage.java   |   4 +-
 .../jcr/parts/GenericPropertyPage.java        |  10 +-
 .../jcr/parts/ImportFileSystemWizard.java     |   2 +-
 .../jcr/parts/JcrQueryEditorInput.java        |   2 +-
 .../internal/jcr/parts/NodeEditorInput.java   |   2 +-
 .../jcr/parts/NodePrivilegesPage.java         |   6 +-
 .../jcr/parts/NodeVersionHistoryPage.java     |  20 ++--
 .../jcr/parts/StringNodeEditorInput.java      |   2 +-
 .../internal/useradmin}/PartStateChanged.java |   2 +-
 .../useradmin}/SecurityAdminImages.java       |  12 +-
 .../internal/useradmin}/UiAdminUtils.java     |   4 +-
 .../useradmin}/UiUserAdminListener.java       |   2 +-
 .../internal/useradmin}/UserAdminWrapper.java |   2 +-
 .../internal/useradmin}/UsersImages.java      |  10 +-
 .../internal/useradmin}/UsersUtils.java       |   2 +-
 .../useradmin}/commands/DeleteGroups.java     |  10 +-
 .../useradmin}/commands/DeleteUsers.java      |  10 +-
 .../useradmin}/commands/ForceRefresh.java     |   6 +-
 .../useradmin}/commands/NewGroup.java         |   8 +-
 .../internal/useradmin}/commands/NewUser.java |   8 +-
 .../useradmin}/commands/SaveArgeoUser.java    |   6 +-
 .../useradmin}/commands/UserBatchUpdate.java  |   6 +-
 .../commands/UserTransactionHandler.java      |  10 +-
 .../parts/ArgeoUserEditorInput.java           |   2 +-
 .../useradmin}/parts/DefaultUserMainPage.java |   2 +-
 .../useradmin}/parts/GroupMainPage.java       |  22 ++--
 .../internal/useradmin}/parts/GroupsView.java |  22 ++--
 .../parts/UserBatchUpdateWizard.java          |  12 +-
 .../internal/useradmin}/parts/UserEditor.java |  12 +-
 .../useradmin}/parts/UserEditorInput.java     |   2 +-
 .../useradmin}/parts/UserMainPage.java        |  22 ++--
 .../internal/useradmin}/parts/UsersView.java  |  22 ++--
 .../useradmin}/providers/CommonNameLP.java    |   2 +-
 .../useradmin}/providers/DomainNameLP.java    |   2 +-
 .../internal/useradmin}/providers/MailLP.java |   2 +-
 .../useradmin}/providers/RoleIconLP.java      |   4 +-
 .../providers/UserAdminAbstractLP.java        |   2 +-
 .../providers/UserDragListener.java           |   2 +-
 .../useradmin}/providers/UserFilter.java      |   2 +-
 .../useradmin}/providers/UserNameLP.java      |   2 +-
 .../UserTableDefaultDClickListener.java       |  10 +-
 .../providers/UserTransactionProvider.java    |   6 +-
 .../ui/workbench/jcr/DefaultNodeEditor.java   |  28 ++---
 .../workbench/jcr/GenericJcrQueryEditor.java  |   8 +-
 .../ui/workbench/jcr/JcrBrowserView.java      |  18 +--
 .../ui/workbench/jcr/JcrImages.java           |  32 ++---
 .../ui/workbench/jcr/JcrPreferenceStore.java  |   2 +-
 .../ui/workbench/osgi/BundleNode.java         |   2 +-
 .../ui/workbench/osgi/BundlesView.java        |   6 +-
 .../ui/workbench/osgi/ModulesView.java        |   6 +-
 .../workbench/osgi/MultiplePackagesView.java  |   6 +-
 .../ui/workbench/osgi/OsgiExplorerImages.java |  16 +--
 .../workbench/osgi/ServiceReferenceNode.java  |   2 +-
 .../ui/workbench/osgi/StateLabelProvider.java |   2 +-
 .../ui/workbench/useradmin}/AdminLogView.java |   6 +-
 .../useradmin}/LogContentProvider.java        |   2 +-
 .../ui/workbench/useradmin}/LogView.java      |   6 +-
 .../useradmin}/PickUpUserDialog.java          |   4 +-
 .../ui/workbench/useradmin}/UserLP.java       |   6 +-
 .../ui/workbench/useradmin}/UserProfile.java  |   6 +-
 .../ui/workbench/util}/CommandUtils.java      |   6 +-
 .../ui/workbench/util}/PrivilegedJob.java     |   2 +-
 .../workbench/util}/RolesSourceProvider.java  |   2 +-
 .../eclipse/ui/workbench/ErrorFeedback.java   |  29 -----
 .../ui/workbench/WorkbenchUiPlugin.java       | 109 ------------------
 .../ui/admin/SecurityAdminPlugin.java         |  52 ---------
 123 files changed, 471 insertions(+), 666 deletions(-)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse/ui/workbench/jcr => cms/ui/workbench}/JcrBrowserPerspective.java (86%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui => cms/ui/workbench}/MaintenancePerspective.java (84%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse/ui/workbench/osgi => cms/ui/workbench}/OsgiExplorerPerspective.java (95%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui/admin => cms/ui/workbench}/SecurityAdminPerspective.java (86%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui => cms/ui/workbench}/UserHomePerspective.java (83%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/{SecurityUiPlugin.java => WorkbenchUiPlugin.java} (95%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/commands/DoNothing.java (67%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui => cms/ui/workbench}/commands/OpenChangePasswordDialog.java (99%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/commands/OpenEditor.java (81%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/commands/OpenFile.java (93%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui => cms/ui/workbench}/commands/OpenHomePerspective.java (92%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse/ui/workbench => cms/ui/workbench/internal}/WorkbenchConstants.java (94%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/internal/jcr/FullVersioningTreeContentProvider.java (98%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/internal/jcr/GenericNodeDoubleClickListener.java (87%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/internal/jcr/JcrBrowserUtils.java (86%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/internal/jcr/NodeContentProvider.java (96%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/internal/jcr/NodeLabelProvider.java (89%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/internal/jcr/PropertiesContentProvider.java (97%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/internal/jcr/PropertyLabelProvider.java (96%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/internal/jcr/SingleNodeAsTreeContentProvider.java (98%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/internal/jcr/VersionLabelProvider.java (96%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse/ui/workbench => cms/ui/workbench/internal/jcr}/commands/AddFolderNode.java (88%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse/ui/workbench => cms/ui/workbench/internal/jcr}/commands/AddPrivileges.java (87%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse/ui/workbench => cms/ui/workbench/internal/jcr}/commands/AddRemoteRepository.java (97%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse/ui/workbench => cms/ui/workbench/internal/jcr}/commands/CreateWorkspace.java (88%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse/ui/workbench => cms/ui/workbench/internal/jcr}/commands/DeleteNodes.java (93%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse/ui/workbench => cms/ui/workbench/internal/jcr}/commands/DumpNode.java (90%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse/ui/workbench => cms/ui/workbench/internal/jcr}/commands/EditNode.java (94%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse/ui/workbench => cms/ui/workbench/internal/jcr}/commands/GetNodeSize.java (90%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse/ui/workbench => cms/ui/workbench/internal/jcr}/commands/ImportFileSystem.java (84%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse/ui/workbench => cms/ui/workbench/internal/jcr}/commands/NodeConfigurableDump.java (97%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse/ui/workbench => cms/ui/workbench/internal/jcr}/commands/Refresh.java (81%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse/ui/workbench => cms/ui/workbench/internal/jcr}/commands/RemovePrivileges.java (94%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse/ui/workbench => cms/ui/workbench/internal/jcr}/commands/RemoveRemoteRepository.java (89%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse/ui/workbench => cms/ui/workbench/internal/jcr}/commands/RenameNode.java (90%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse/ui/workbench => cms/ui/workbench/internal/jcr}/commands/SortChildNodes.java (88%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/internal/jcr/model/MaintainedRepositoryElem.java (90%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/internal/jcr/model/RemoteRepositoryElem.java (97%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/internal/jcr/model/RepositoriesElem.java (98%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/internal/jcr/model/RepositoryElem.java (98%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/internal/jcr/model/SingleJcrNodeElem.java (98%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/internal/jcr/model/WorkspaceElem.java (98%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/internal/jcr/parts/AbstractJcrQueryEditor.java (99%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/internal/jcr/parts/AddPrivilegeWizard.java (97%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/internal/jcr/parts/ChildNodesPage.java (88%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/internal/jcr/parts/ChooseNameDialog.java (97%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/internal/jcr/parts/EmptyNodePage.java (96%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/internal/jcr/parts/GenericNodeEditorInput.java (97%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/internal/jcr/parts/GenericNodePage.java (98%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/internal/jcr/parts/GenericPropertyPage.java (96%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/internal/jcr/parts/ImportFileSystemWizard.java (99%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/internal/jcr/parts/JcrQueryEditorInput.java (96%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/internal/jcr/parts/NodeEditorInput.java (96%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/internal/jcr/parts/NodePrivilegesPage.java (98%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/internal/jcr/parts/NodeVersionHistoryPage.java (93%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/internal/jcr/parts/StringNodeEditorInput.java (98%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui/admin/internal => cms/ui/workbench/internal/useradmin}/PartStateChanged.java (96%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui/admin => cms/ui/workbench/internal/useradmin}/SecurityAdminImages.java (81%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui/admin/internal => cms/ui/workbench/internal/useradmin}/UiAdminUtils.java (88%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui/admin/internal => cms/ui/workbench/internal/useradmin}/UiUserAdminListener.java (92%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui/admin/internal => cms/ui/workbench/internal/useradmin}/UserAdminWrapper.java (97%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse/ui/workbench/internal/users => cms/ui/workbench/internal/useradmin}/UsersImages.java (73%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse/ui/workbench/internal/users => cms/ui/workbench/internal/useradmin}/UsersUtils.java (98%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui/admin/internal => cms/ui/workbench/internal/useradmin}/commands/DeleteGroups.java (91%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui/admin/internal => cms/ui/workbench/internal/useradmin}/commands/DeleteUsers.java (90%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui/admin/internal => cms/ui/workbench/internal/useradmin}/commands/ForceRefresh.java (87%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui/admin/internal => cms/ui/workbench/internal/useradmin}/commands/NewGroup.java (96%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui/admin/internal => cms/ui/workbench/internal/useradmin}/commands/NewUser.java (97%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui/admin/internal => cms/ui/workbench/internal/useradmin}/commands/SaveArgeoUser.java (89%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui/admin/internal => cms/ui/workbench/internal/useradmin}/commands/UserBatchUpdate.java (87%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui/admin/internal => cms/ui/workbench/internal/useradmin}/commands/UserTransactionHandler.java (90%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui/admin/internal => cms/ui/workbench/internal/useradmin}/parts/ArgeoUserEditorInput.java (96%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui/admin/internal => cms/ui/workbench/internal/useradmin}/parts/DefaultUserMainPage.java (99%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui/admin/internal => cms/ui/workbench/internal/useradmin}/parts/GroupMainPage.java (94%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui/admin/internal => cms/ui/workbench/internal/useradmin}/parts/GroupsView.java (90%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui/admin/internal => cms/ui/workbench/internal/useradmin}/parts/UserBatchUpdateWizard.java (97%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui/admin/internal => cms/ui/workbench/internal/useradmin}/parts/UserEditor.java (93%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui/admin/internal => cms/ui/workbench/internal/useradmin}/parts/UserEditorInput.java (96%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui/admin/internal => cms/ui/workbench/internal/useradmin}/parts/UserMainPage.java (95%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui/admin/internal => cms/ui/workbench/internal/useradmin}/parts/UsersView.java (87%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui/admin/internal => cms/ui/workbench/internal/useradmin}/providers/CommonNameLP.java (87%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui/admin/internal => cms/ui/workbench/internal/useradmin}/providers/DomainNameLP.java (85%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui/admin/internal => cms/ui/workbench/internal/useradmin}/providers/MailLP.java (87%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui/admin/internal => cms/ui/workbench/internal/useradmin}/providers/RoleIconLP.java (84%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui/admin/internal => cms/ui/workbench/internal/useradmin}/providers/UserAdminAbstractLP.java (96%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui/admin/internal => cms/ui/workbench/internal/useradmin}/providers/UserDragListener.java (94%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui/admin/internal => cms/ui/workbench/internal/useradmin}/providers/UserFilter.java (96%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui/admin/internal => cms/ui/workbench/internal/useradmin}/providers/UserNameLP.java (82%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui/admin/internal => cms/ui/workbench/internal/useradmin}/providers/UserTableDefaultDClickListener.java (79%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui/admin/internal => cms/ui/workbench/internal/useradmin}/providers/UserTransactionProvider.java (91%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/jcr/DefaultNodeEditor.java (82%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/jcr/GenericJcrQueryEditor.java (88%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/jcr/JcrBrowserView.java (94%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/jcr/JcrImages.java (58%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/jcr/JcrPreferenceStore.java (99%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/osgi/BundleNode.java (95%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/osgi/BundlesView.java (96%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/osgi/ModulesView.java (95%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/osgi/MultiplePackagesView.java (97%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/osgi/OsgiExplorerImages.java (66%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/osgi/ServiceReferenceNode.java (96%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse => cms}/ui/workbench/osgi/StateLabelProvider.java (98%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui/views => cms/ui/workbench/useradmin}/AdminLogView.java (93%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui/views => cms/ui/workbench/useradmin}/LogContentProvider.java (99%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui/views => cms/ui/workbench/useradmin}/LogView.java (92%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse/ui/workbench/users => cms/ui/workbench/useradmin}/PickUpUserDialog.java (98%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse/ui/workbench/users => cms/ui/workbench/useradmin}/UserLP.java (93%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui/views => cms/ui/workbench/useradmin}/UserProfile.java (93%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{eclipse/ui/workbench => cms/ui/workbench/util}/CommandUtils.java (97%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui => cms/ui/workbench/util}/PrivilegedJob.java (96%)
 rename org.argeo.cms.ui.workbench/src/org/argeo/{security/ui => cms/ui/workbench/util}/RolesSourceProvider.java (97%)
 delete mode 100644 org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/ErrorFeedback.java
 delete mode 100644 org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/WorkbenchUiPlugin.java
 delete mode 100644 org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/SecurityAdminPlugin.java

diff --git a/org.argeo.cms.ui.workbench.rap/META-INF/spring/commands.xml b/org.argeo.cms.ui.workbench.rap/META-INF/spring/commands.xml
index 802d31de6..3fdfbe3d6 100644
--- a/org.argeo.cms.ui.workbench.rap/META-INF/spring/commands.xml
+++ b/org.argeo.cms.ui.workbench.rap/META-INF/spring/commands.xml
@@ -4,7 +4,7 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
         http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-	<bean id="openChangePasswordDialog" class="org.argeo.security.ui.commands.OpenChangePasswordDialog"
+	<bean id="openChangePasswordDialog" class="org.argeo.cms.ui.workbench.commands.OpenChangePasswordDialog"
 		scope="prototype">
 		<property name="userAdmin" ref="userAdmin" />
 		<property name="userTransaction" ref="userTransaction" />
@@ -12,7 +12,7 @@
 
 
 	<!-- RAP Specific command and corresponding service to enable open file -->
-	<bean id="org.argeo.eclipse.ui.workbench.openFile" class="org.argeo.eclipse.ui.workbench.commands.OpenFile"
+	<bean id="org.argeo.eclipse.ui.workbench.openFile" class="org.argeo.cms.ui.workbench.commands.OpenFile"
 	scope="prototype">
 		<property name="openFileServiceId"
 			value="org.argeo.security.ui.specific.openFileService" />
diff --git a/org.argeo.cms.ui.workbench.rap/bnd.bnd b/org.argeo.cms.ui.workbench.rap/bnd.bnd
index 9f4fc9245..96534754a 100644
--- a/org.argeo.cms.ui.workbench.rap/bnd.bnd
+++ b/org.argeo.cms.ui.workbench.rap/bnd.bnd
@@ -4,11 +4,11 @@ Bundle-ActivationPolicy: lazy
 
 Require-Bundle: org.eclipse.rap.ui,org.eclipse.core.runtime
 
-Import-Package: org.argeo.eclipse.spring,\
-org.argeo.eclipse.ui.specific,\
-org.argeo.eclipse.ui.workbench.commands,\
-org.argeo.cms,\
+Import-Package: org.argeo.cms,\
 org.argeo.cms.auth,\
-org.argeo.security.ui,\
+org.argeo.cms.ui.workbench,\
+org.argeo.cms.ui.workbench.commands,\
+org.argeo.eclipse.ui.specific,\
+org.argeo.eclipse.spring,\
 org.argeo.node,\
 *
diff --git a/org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/RapActionBarAdvisor.java b/org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/RapActionBarAdvisor.java
index 14bcee124..0ca598dce 100644
--- a/org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/RapActionBarAdvisor.java
+++ b/org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/RapActionBarAdvisor.java
@@ -16,7 +16,7 @@
 package org.argeo.security.ui.rap;
 
 import org.argeo.cms.auth.CurrentUser;
-import org.argeo.security.ui.commands.OpenHomePerspective;
+import org.argeo.cms.ui.workbench.commands.OpenHomePerspective;
 import org.eclipse.core.commands.Category;
 import org.eclipse.core.commands.Command;
 import org.eclipse.jface.action.ICoolBarManager;
diff --git a/org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/commands/OpenHome.java b/org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/commands/OpenHome.java
index 37ebe3572..cc1bca86d 100644
--- a/org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/commands/OpenHome.java
+++ b/org.argeo.cms.ui.workbench.rap/src/org/argeo/security/ui/rap/commands/OpenHome.java
@@ -15,9 +15,9 @@
  */
 package org.argeo.security.ui.rap.commands;
 
+import org.argeo.cms.ui.workbench.UserHomePerspective;
+import org.argeo.cms.ui.workbench.util.CommandUtils;
 import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
-import org.argeo.eclipse.ui.workbench.CommandUtils;
-import org.argeo.security.ui.UserHomePerspective;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
diff --git a/org.argeo.cms.ui.workbench/META-INF/spring/commands.xml b/org.argeo.cms.ui.workbench/META-INF/spring/commands.xml
index d51c0a2e9..1c74f7a2b 100644
--- a/org.argeo.cms.ui.workbench/META-INF/spring/commands.xml
+++ b/org.argeo.cms.ui.workbench/META-INF/spring/commands.xml
@@ -5,51 +5,51 @@
         http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<!-- USERS CRUDS -->
-	<bean id="newUser" class="org.argeo.security.ui.admin.internal.commands.NewUser"
+	<bean id="newUser" class="org.argeo.cms.ui.workbench.internal.useradmin.commands.NewUser"
 		scope="prototype">
 		<property name="userAdminWrapper" ref="userAdminWrapper" />
 	</bean>
 	<bean id="deleteUsers"
-		class="org.argeo.security.ui.admin.internal.commands.DeleteUsers"
+		class="org.argeo.cms.ui.workbench.internal.useradmin.commands.DeleteUsers"
 		scope="prototype">
 		<property name="userAdminWrapper" ref="userAdminWrapper" />
 	</bean>
 	<bean id="userBatchUpdate"
-		class="org.argeo.security.ui.admin.internal.commands.UserBatchUpdate"
+		class="org.argeo.cms.ui.workbench.internal.useradmin.commands.UserBatchUpdate"
 		scope="prototype">
 		<property name="userAdminWrapper" ref="userAdminWrapper" />
 	</bean>
 	<!-- GROUPS CRUDS -->
-	<bean id="newGroup" class="org.argeo.security.ui.admin.internal.commands.NewGroup"
+	<bean id="newGroup" class="org.argeo.cms.ui.workbench.internal.useradmin.commands.NewGroup"
 		scope="prototype">
 		<property name="userAdminWrapper" ref="userAdminWrapper" />
 	</bean>
 	<bean id="deleteGroups"
-		class="org.argeo.security.ui.admin.internal.commands.DeleteGroups"
+		class="org.argeo.cms.ui.workbench.internal.useradmin.commands.DeleteGroups"
 		scope="prototype">
 		<property name="userAdminWrapper" ref="userAdminWrapper" />
 	</bean>
 
 	<!-- TRANSACTIONS -->
 	<bean id="userTransactionHandler"
-		class="org.argeo.security.ui.admin.internal.commands.UserTransactionHandler"
+		class="org.argeo.cms.ui.workbench.internal.useradmin.commands.UserTransactionHandler"
 		scope="prototype">
 		<property name="userAdminWrapper" ref="userAdminWrapper" />
 	</bean>
 	
 	<!-- DATA EXPLORER -->
 	<bean id="addRemoteRepository"
-		class="org.argeo.eclipse.ui.workbench.commands.AddRemoteRepository">
+		class="org.argeo.cms.ui.workbench.internal.jcr.commands.AddRemoteRepository">
 		<property name="repositoryFactory" ref="repositoryFactory" />
 		<property name="nodeRepository" ref="nodeRepository" />
 		<property name="keyring" ref="keyring" />
 	</bean>
 
-	<bean id="addPrivileges" class="org.argeo.eclipse.ui.workbench.commands.AddPrivileges">
+	<bean id="addPrivileges" class="org.argeo.cms.ui.workbench.internal.jcr.commands.AddPrivileges">
 		<property name="userAdmin" ref="userAdmin" />
 	</bean>
 	<bean id="removePrivileges"
-		class="org.argeo.eclipse.ui.workbench.commands.RemovePrivileges">
+		class="org.argeo.cms.ui.workbench.internal.jcr.commands.RemovePrivileges">
 		<!-- <property name="userAdmin" ref="userAdmin" /> -->
 	</bean>
 </beans>
diff --git a/org.argeo.cms.ui.workbench/META-INF/spring/common.xml b/org.argeo.cms.ui.workbench/META-INF/spring/common.xml
index db613a05b..ff4304d16 100644
--- a/org.argeo.cms.ui.workbench/META-INF/spring/common.xml
+++ b/org.argeo.cms.ui.workbench/META-INF/spring/common.xml
@@ -4,12 +4,12 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 	<bean id="userTransactionProvider"
-		class="org.argeo.security.ui.admin.internal.providers.UserTransactionProvider"
+		class="org.argeo.cms.ui.workbench.internal.useradmin.providers.UserTransactionProvider"
 		scope="singleton" lazy-init="false">
 		<property name="userTransaction" ref="userTransaction" />
 	</bean>
 
-	<bean id="userAdminWrapper" class="org.argeo.security.ui.admin.internal.UserAdminWrapper"
+	<bean id="userAdminWrapper" class="org.argeo.cms.ui.workbench.internal.useradmin.UserAdminWrapper"
 		scope="singleton" lazy-init="false">
 		<property name="userTransaction" ref="userTransaction" />
 		<property name="userAdmin" ref="userAdmin" />
diff --git a/org.argeo.cms.ui.workbench/META-INF/spring/parts.xml b/org.argeo.cms.ui.workbench/META-INF/spring/parts.xml
index 766348450..131b180de 100644
--- a/org.argeo.cms.ui.workbench/META-INF/spring/parts.xml
+++ b/org.argeo.cms.ui.workbench/META-INF/spring/parts.xml
@@ -8,22 +8,22 @@
 	<!-- SECURITY  -->
 
 	<!-- Editors -->
-	<bean id="userEditor" class="org.argeo.security.ui.admin.internal.parts.UserEditor"
+	<bean id="userEditor" class="org.argeo.cms.ui.workbench.internal.useradmin.parts.UserEditor"
 		scope="prototype">
 		<property name="userAdminWrapper" ref="userAdminWrapper" />
 	</bean>
 
-	<bean id="groupEditor" class="org.argeo.security.ui.admin.internal.parts.UserEditor"
+	<bean id="groupEditor" class="org.argeo.cms.ui.workbench.internal.useradmin.parts.UserEditor"
 		scope="prototype">
 		<property name="userAdminWrapper" ref="userAdminWrapper" />
 	</bean>
 	
 	<!-- Views -->
-	<bean id="usersView" class="org.argeo.security.ui.admin.internal.parts.UsersView"
+	<bean id="usersView" class="org.argeo.cms.ui.workbench.internal.useradmin.parts.UsersView"
 		scope="prototype">
 		<property name="userAdminWrapper" ref="userAdminWrapper" />
 	</bean>
-	<bean id="groupsView" class="org.argeo.security.ui.admin.internal.parts.GroupsView"
+	<bean id="groupsView" class="org.argeo.cms.ui.workbench.internal.useradmin.parts.GroupsView"
 		scope="prototype">
 		<property name="userAdminWrapper" ref="userAdminWrapper" />
 	</bean>
@@ -32,16 +32,16 @@
 	<!-- DATA EXPLORER  -->
 	<!-- Editors -->
 	<bean id="genericJcrQueryEditor"
-		class="org.argeo.eclipse.ui.workbench.jcr.GenericJcrQueryEditor"
+		class="org.argeo.cms.ui.workbench.jcr.GenericJcrQueryEditor"
 		scope="prototype">
 		<property name="session" ref="nodeSession" />
 	</bean>
-	<bean id="defaultNodeEditor" class="org.argeo.eclipse.ui.workbench.jcr.DefaultNodeEditor"
+	<bean id="defaultNodeEditor" class="org.argeo.cms.ui.workbench.jcr.DefaultNodeEditor"
 		scope="prototype">
 	</bean>
 
 	<!-- Views -->
-	<bean id="jcrBrowserView" class="org.argeo.eclipse.ui.workbench.jcr.JcrBrowserView"
+	<bean id="jcrBrowserView" class="org.argeo.cms.ui.workbench.jcr.JcrBrowserView"
 		scope="prototype">
 		<property name="repositoryRegister" ref="repositoryRegister" />
 		<property name="repositoryFactory" ref="repositoryFactory" />
diff --git a/org.argeo.cms.ui.workbench/META-INF/spring/views.xml b/org.argeo.cms.ui.workbench/META-INF/spring/views.xml
index e5363dcc0..767464008 100644
--- a/org.argeo.cms.ui.workbench/META-INF/spring/views.xml
+++ b/org.argeo.cms.ui.workbench/META-INF/spring/views.xml
@@ -4,12 +4,12 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
         http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-	<bean id="logView" class="org.argeo.security.ui.views.LogView"
+	<bean id="logView" class="org.argeo.cms.ui.workbench.useradmin.LogView"
 		scope="prototype">
 		<property name="argeoLogger" ref="secureLogger" />
 	</bean>
 
-	<bean id="adminLogView" class="org.argeo.security.ui.views.AdminLogView"
+	<bean id="adminLogView" class="org.argeo.cms.ui.workbench.useradmin.AdminLogView"
 		scope="prototype">
 		<property name="argeoLogger" ref="secureLogger" />
 	</bean>
diff --git a/org.argeo.cms.ui.workbench/plugin.xml b/org.argeo.cms.ui.workbench/plugin.xml
index 5b2ead753..5c77ab7d8 100644
--- a/org.argeo.cms.ui.workbench/plugin.xml
+++ b/org.argeo.cms.ui.workbench/plugin.xml
@@ -5,31 +5,31 @@
          point="org.eclipse.ui.perspectives">
       <perspective
             id="org.argeo.cms.ui.workbench.adminSecurityPerspective"
-            class="org.argeo.security.ui.admin.SecurityAdminPerspective"
+            class="org.argeo.cms.ui.workbench.SecurityAdminPerspective"
             icon="icons/security.gif"
             name="Security">
       </perspective>
       <perspective
             id="org.argeo.cms.ui.workbench.userHomePerspective"
-            class="org.argeo.security.ui.UserHomePerspective"
+            class="org.argeo.cms.ui.workbench.UserHomePerspective"
             icon="icons/home.gif"
             name="Home">
       </perspective>
       <perspective
             id="org.argeo.cms.ui.workbench.adminMaintenancePerspective"
-            class="org.argeo.security.ui.MaintenancePerspective"
+            class="org.argeo.cms.ui.workbench.MaintenancePerspective"
             icon="icons/maintenance.gif"
             name="Maintenance">
       </perspective>
-            <perspective
+      <perspective
             id="org.argeo.cms.ui.workbench.osgiPerspective"
-            class="org.argeo.eclipse.ui.workbench.osgi.OsgiExplorerPerspective"
+            class="org.argeo.cms.ui.workbench.OsgiExplorerPerspective"
             name="Monitoring"
             icon="icons/osgi_explorer.gif">
       </perspective>
       <perspective
             id="org.argeo.cms.ui.workbench.jcrBrowserPerspective"
-            class="org.argeo.eclipse.ui.workbench.jcr.JcrBrowserPerspective"
+            class="org.argeo.cms.ui.workbench.JcrBrowserPerspective"
             name="Data Explorer"
             icon="icons/nodes.gif">
       </perspective>
@@ -37,7 +37,7 @@
    
     <!-- Definition of the OSGI perspective -->
     <extension point="org.eclipse.ui.perspectiveExtensions"> 
-        <perspectiveExtension targetID="org.argeo.eclipse.ui.workbench.osgiPerspective"> 
+        <perspectiveExtension targetID="org.argeo.cms.ui.workbench.osgiPerspective"> 
             <view 
             	id="org.argeo.cms.ui.workbench.modulesView" 
             	minimized="false"
@@ -79,7 +79,7 @@
       <!-- Home -->
       <view
             id="org.argeo.cms.ui.workbench.userProfile"
-            class="org.argeo.security.ui.views.UserProfile"
+            class="org.argeo.cms.ui.workbench.useradmin.UserProfile"
             icon="icons/user.gif"
             name="Profile"
             restorable="true">
@@ -104,19 +104,19 @@
       		name="Modules"
             id="org.argeo.cms.ui.workbench.modulesView"
             icon="icons/service_published.gif"
-			class="org.argeo.eclipse.ui.workbench.osgi.ModulesView">
+			class="org.argeo.cms.ui.workbench.osgi.ModulesView">
 		</view>
 		<view
       		name="Bundles"
             id="org.argeo.cms.ui.workbench.bundlesView" 
             icon="icons/bundles.gif"
-            class="org.argeo.eclipse.ui.workbench.osgi.BundlesView">
+            class="org.argeo.cms.ui.workbench.osgi.BundlesView">
 		</view>
 		<view
       		name="Multiple Packages"
             id="org.argeo.cms.ui.workbench.multiplePackagesView" 
             icon="icons/node.gif"
-            class="org.argeo.eclipse.ui.workbench.osgi.MultiplePackagesView">
+            class="org.argeo.cms.ui.workbench.osgi.MultiplePackagesView">
 		</view>
 		<!-- Data Explorer -->
 		<view
@@ -204,13 +204,13 @@
 
  	  <!-- Force the refresh when the various listener are not enough -->
       <command
-            defaultHandler="org.argeo.security.ui.admin.internal.commands.ForceRefresh"
+            defaultHandler="org.argeo.cms.ui.workbench.internal.useradmin.commands.ForceRefresh"
             id="org.argeo.cms.ui.workbench.forceRefresh"
             name="Force Refresh">
       </command>
       <!-- Data Explorer -->
       <command
-			defaultHandler="org.argeo.eclipse.ui.workbench.commands.OpenEditor"
+			defaultHandler="org.argeo.cms.ui.workbench.commands.OpenEditor"
             id="org.argeo.cms.ui.workbench.openEditor"
             name="Open an editor given its ID">
             <commandParameter
@@ -224,7 +224,7 @@
   	 		</commandParameter>
 		</command>
     	<command
-			defaultHandler="org.argeo.eclipse.ui.workbench.commands.GetNodeSize"
+			defaultHandler="org.argeo.cms.ui.workbench.internal.jcr.commands.GetNodeSize"
 			id="org.argeo.cms.ui.workbench.getNodeSize"
 			name="Get node size">
 		</command>    
@@ -238,12 +238,12 @@
   	 		</commandParameter> -->
 		</command>    
     	<command
-			defaultHandler="org.argeo.eclipse.ui.workbench.commands.RemoveRemoteRepository"
+			defaultHandler="org.argeo.cms.ui.workbench.internal.jcr.commands.RemoveRemoteRepository"
 			id="org.argeo.cms.ui.workbench.removeRemoteRepository"
 			name="Remove remote JCR repository">
 		</command>    
 		<command
-	        defaultHandler="org.argeo.eclipse.ui.workbench.commands.AddFolderNode"
+	        defaultHandler="org.argeo.cms.ui.workbench.internal.jcr.commands.AddFolderNode"
 	        id="org.argeo.cms.ui.workbench.addFolderNode"
 	        name="Create a new folder">
 		</command>
@@ -258,22 +258,22 @@
 			name="Remove Privileges">
 		</command>
 		<command
-			defaultHandler="org.argeo.eclipse.ui.workbench.commands.CreateWorkspace"
+			defaultHandler="org.argeo.cms.ui.workbench.internal.jcr.commands.CreateWorkspace"
 			id="org.argeo.cms.ui.workbench.createWorkspace"
 			name="Create a new workspace">
 		</command>
 		<command
-			defaultHandler="org.argeo.eclipse.ui.workbench.commands.Refresh"
+			defaultHandler="org.argeo.cms.ui.workbench.internal.jcr.commands.Refresh"
 			id="org.argeo.cms.ui.workbench.refresh"
 			name="Refresh">
 		</command>
 		<command
-			defaultHandler="org.argeo.eclipse.ui.workbench.commands.DeleteNodes"
+			defaultHandler="org.argeo.cms.ui.workbench.internal.jcr.commands.DeleteNodes"
 			id="org.argeo.cms.ui.workbench.deleteNodes"
 			name="Delete nodes">
 		</command>
 		<command
-	        defaultHandler="org.argeo.eclipse.ui.workbench.commands.ImportFileSystem"
+	        defaultHandler="org.argeo.cms.ui.workbench.internal.jcr.commands.ImportFileSystem"
 	        id="org.argeo.cms.ui.workbench.importFileSystem"
 	        name="Import files...">
 		</command>
@@ -283,22 +283,22 @@
 	        name="Open current file">
 		</command> -->
 		<command
-	        defaultHandler="org.argeo.eclipse.ui.workbench.commands.DumpNode"
+	        defaultHandler="org.argeo.cms.ui.workbench.internal.jcr.commands.DumpNode"
 	        id="org.argeo.cms.ui.workbench.dumpNode"
 	        name="Dump Current Selected Node">
 		</command>
 		<command
-	        defaultHandler="org.argeo.eclipse.ui.workbench.commands.RenameNode"
+	        defaultHandler="org.argeo.cms.ui.workbench.internal.jcr.commands.RenameNode"
 	        id="org.argeo.cms.ui.workbench.renameNode"
 	        name="Rename Current Selected Node">
 		</command>
 		<command
-	        defaultHandler="org.argeo.eclipse.ui.workbench.commands.NodeConfigurableDump"
+	        defaultHandler="org.argeo.cms.ui.workbench.internal.jcr.commands.NodeConfigurableDump"
 	        id="org.argeo.cms.ui.workbench.nodeConfigurableDump"
 	        name="Configurable dump of the selected Node">
 		</command>
 		<command
-			defaultHandler="org.argeo.eclipse.ui.workbench.commands.SortChildNodes"
+			defaultHandler="org.argeo.cms.ui.workbench.internal.jcr.commands.SortChildNodes"
 			id="org.argeo.cms.ui.workbench.sortChildNodes"
 			name="Sort node tree">
             <!-- FIXME: default value does not work -->
@@ -449,10 +449,10 @@
 				      <and>
 				         <or>
 				            <instanceof
-				                  value="org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem">
+				                  value="org.argeo.cms.ui.workbench.internal.jcr.model.SingleJcrNodeElem">
 				            </instanceof>
 				            <instanceof
-				                  value="org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem">
+				                  value="org.argeo.cms.ui.workbench.internal.jcr.model.WorkspaceElem">
 				            </instanceof>
 				         </or>
              			<with variable="activeMenuSelection"><count value="1"/></with>
@@ -470,10 +470,10 @@
 				      <and>
 				         <or>
 				            <instanceof
-				                  value="org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem">
+				                  value="org.argeo.cms.ui.workbench.internal.jcr.model.SingleJcrNodeElem">
 				            </instanceof>
 				            <instanceof
-				                  value="org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem">
+				                  value="org.argeo.cms.ui.workbench.internal.jcr.model.WorkspaceElem">
 				            </instanceof>
 				         </or>
              			<with variable="activeMenuSelection"><count value="1"/></with>
@@ -491,10 +491,10 @@
 				      <and>
 				         <or>
 				            <instanceof
-				                  value="org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem">
+				                  value="org.argeo.cms.ui.workbench.internal.jcr.model.SingleJcrNodeElem">
 				            </instanceof>
 				            <instanceof
-				                  value="org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem">
+				                  value="org.argeo.cms.ui.workbench.internal.jcr.model.WorkspaceElem">
 				            </instanceof>
 				         </or>
              			<with variable="activeMenuSelection"><count value="1"/></with>
@@ -512,7 +512,7 @@
 			      		<and>
 			         		<or>
 			            		<instanceof
-			                  		value="org.argeo.eclipse.ui.workbench.internal.jcr.model.RepositoryElem">
+			                  		value="org.argeo.cms.ui.workbench.internal.jcr.model.RepositoryElem">
 			            		</instanceof>
 			         		</or>
              				<with variable="activeMenuSelection"><count value="1"/></with>
@@ -529,9 +529,9 @@
 					<iterate>
 						<or>
 							<instanceof
-								value="org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem" />
+								value="org.argeo.cms.ui.workbench.internal.jcr.model.SingleJcrNodeElem" />
 							<instanceof
-								value="org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem" />
+								value="org.argeo.cms.ui.workbench.internal.jcr.model.WorkspaceElem" />
 						</or>
 					</iterate>
 				</visibleWhen>
@@ -546,9 +546,9 @@
 						<and>
 							<or>
 								<instanceof
-									value="org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem" />
+									value="org.argeo.cms.ui.workbench.internal.jcr.model.SingleJcrNodeElem" />
 								<instanceof
-                          			value="org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem" />
+                          			value="org.argeo.cms.ui.workbench.internal.jcr.model.WorkspaceElem" />
                  			</or>
                  			<with variable="activeMenuSelection"><count value="1"/></with>
 						</and>
@@ -563,9 +563,9 @@
 						<iterate> 
 							<or>
 								<instanceof
-                    				value="org.argeo.eclipse.ui.workbench.internal.jcr.model.RepositoriesElem" />
+                    				value="org.argeo.cms.ui.workbench.internal.jcr.model.RepositoriesElem" />
 								<instanceof
-									value="org.argeo.eclipse.ui.workbench.internal.jcr.model.RepositoryElem" />
+									value="org.argeo.cms.ui.workbench.internal.jcr.model.RepositoryElem" />
 							</or> 
 						</iterate>
 					</visibleWhen>
@@ -578,7 +578,7 @@
 					<iterate> 
 						<or>
 							<instanceof
-								value="org.argeo.eclipse.ui.workbench.internal.jcr.model.RemoteRepositoryElem" />
+								value="org.argeo.cms.ui.workbench.internal.jcr.model.RemoteRepositoryElem" />
 						</or> 
            			</iterate>
 				</visibleWhen>
@@ -591,9 +591,9 @@
 						<iterate>
 							<or>
 								<instanceof
-									value="org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem" />
+									value="org.argeo.cms.ui.workbench.internal.jcr.model.SingleJcrNodeElem" />
 								<instanceof
-									value="org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem" />
+									value="org.argeo.cms.ui.workbench.internal.jcr.model.WorkspaceElem" />
               				</or>
            				</iterate>
 					</visibleWhen>
@@ -605,7 +605,7 @@
 				style="push">
 				<visibleWhen>
 					<iterate> <and>
-						<instanceof value="org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem"></instanceof>
+						<instanceof value="org.argeo.cms.ui.workbench.internal.jcr.model.SingleJcrNodeElem"></instanceof>
              			<with variable="activeMenuSelection"><count value="1"/></with>
 					</and> </iterate>
 				</visibleWhen>
@@ -617,7 +617,7 @@
 				style="push">
 				<visibleWhen>
 					<iterate> <and>
-						<instanceof value="org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem"></instanceof>
+						<instanceof value="org.argeo.cms.ui.workbench.internal.jcr.model.SingleJcrNodeElem"></instanceof>
              			<with variable="activeMenuSelection"><count value="1"/></with>
 					</and> </iterate>
 				</visibleWhen>
@@ -630,7 +630,7 @@
 				<visibleWhen>
 					<iterate> 
 						<and>
-							<instanceof value="org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem"></instanceof>
+							<instanceof value="org.argeo.cms.ui.workbench.internal.jcr.model.SingleJcrNodeElem"></instanceof>
              				<with variable="activeMenuSelection"><count value="1"/></with>
 						</and> 
 					</iterate>
@@ -652,7 +652,7 @@
 	      	</variable>
 	   	</sourceProvider>
 	   	<sourceProvider
-              provider="org.argeo.security.ui.RolesSourceProvider">
+              provider="org.argeo.cms.ui.workbench.util.RolesSourceProvider">
            <variable
                  name="org.argeo.cms.ui.workbench.rolesVariable"
                  priorityLevel="workbench">
@@ -677,13 +677,13 @@
 		 <activityPatternBinding
 			pattern="org.argeo.cms.ui.workbench/org.argeo.cms.ui.workbench.osgiPerspective"
 			isEqualityPattern="true"
-			activityId="org.argeo.security.ui.adminActivity">
+			activityId="org.argeo.cms.ui.workbench.adminActivity">
 			<!-- activityId="org.argeo.security.ui.adminActivity" -->
         </activityPatternBinding>
         <activityPatternBinding
 			pattern="org.argeo.cms.ui.workbench/org.argeo.cms.ui.workbench.jcrBrowserPerspective"
 			isEqualityPattern="true"
-			activityId="org.argeo.security.ui.adminActivity">
+			activityId="org.argeo.cms.ui.workbench.adminActivity">
 		</activityPatternBinding>
 		
 		<activity
@@ -787,6 +787,6 @@
 	
 	<!-- STARTUP  --> 
 	<extension point="org.eclipse.ui.startup">
-   		<startup class="org.argeo.security.ui.admin.internal.PartStateChanged"/>
+   		<startup class="org.argeo.cms.ui.workbench.internal.useradmin.PartStateChanged"/>
 	</extension>
 </plugin>
\ No newline at end of file
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrBrowserPerspective.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/JcrBrowserPerspective.java
similarity index 86%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrBrowserPerspective.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/JcrBrowserPerspective.java
index 065ae524e..0b235f7e9 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrBrowserPerspective.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/JcrBrowserPerspective.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.jcr;
+package org.argeo.cms.ui.workbench;
 
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.jcr.JcrBrowserView;
 import org.eclipse.ui.IFolderLayout;
 import org.eclipse.ui.IPageLayout;
 import org.eclipse.ui.IPerspectiveFactory;
@@ -26,7 +26,7 @@ public class JcrBrowserPerspective implements IPerspectiveFactory {
 	public void createInitialLayout(IPageLayout layout) {
 		layout.setEditorAreaVisible(true);
 		IFolderLayout upperLeft = layout.createFolder(
-				SecurityUiPlugin.PLUGIN_ID + ".upperLeft", IPageLayout.LEFT,
+				WorkbenchUiPlugin.PLUGIN_ID + ".upperLeft", IPageLayout.LEFT,
 				0.4f, layout.getEditorArea());
 		upperLeft.addView(JcrBrowserView.ID);
 
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/MaintenancePerspective.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/MaintenancePerspective.java
similarity index 84%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/MaintenancePerspective.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/MaintenancePerspective.java
index 5a1ff66fe..da9e26c0f 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/MaintenancePerspective.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/MaintenancePerspective.java
@@ -13,18 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui;
+package org.argeo.cms.ui.workbench;
 
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
-import org.argeo.security.ui.views.AdminLogView;
-import org.argeo.security.ui.views.UserProfile;
+import org.argeo.cms.ui.workbench.useradmin.AdminLogView;
+import org.argeo.cms.ui.workbench.useradmin.UserProfile;
 import org.eclipse.ui.IFolderLayout;
 import org.eclipse.ui.IPageLayout;
 import org.eclipse.ui.IPerspectiveFactory;
 
 /** Home perspective for the current user */
 public class MaintenancePerspective implements IPerspectiveFactory {
-	public final static String ID = SecurityUiPlugin.PLUGIN_ID
+	public final static String ID = WorkbenchUiPlugin.PLUGIN_ID
 			+ ".adminMaintenancePerspective";
 
 	public void createInitialLayout(IPageLayout layout) {
@@ -40,7 +39,5 @@ public class MaintenancePerspective implements IPerspectiveFactory {
 				0.30f, editorArea);
 		left.addView(UserProfile.ID);
 		// left.addView(RolesView.ID);
-
 	}
-
-}
+}
\ No newline at end of file
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/OsgiExplorerPerspective.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/OsgiExplorerPerspective.java
similarity index 95%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/OsgiExplorerPerspective.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/OsgiExplorerPerspective.java
index 8f7f26206..5534a6126 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/OsgiExplorerPerspective.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/OsgiExplorerPerspective.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.osgi;
+package org.argeo.cms.ui.workbench;
 
 import org.eclipse.ui.IPageLayout;
 import org.eclipse.ui.IPerspectiveFactory;
@@ -24,7 +24,5 @@ public class OsgiExplorerPerspective implements IPerspectiveFactory {
 	public void createInitialLayout(IPageLayout layout) {
 		layout.setEditorAreaVisible(true);
 		layout.setFixed(false);
-
 	}
-
 }
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/SecurityAdminPerspective.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/SecurityAdminPerspective.java
similarity index 86%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/SecurityAdminPerspective.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/SecurityAdminPerspective.java
index 2334827c9..f9904f2f1 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/SecurityAdminPerspective.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/SecurityAdminPerspective.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui.admin;
+package org.argeo.cms.ui.workbench;
 
-import org.argeo.security.ui.admin.internal.parts.GroupsView;
-import org.argeo.security.ui.admin.internal.parts.UsersView;
+import org.argeo.cms.ui.workbench.internal.useradmin.parts.GroupsView;
+import org.argeo.cms.ui.workbench.internal.useradmin.parts.UsersView;
 import org.eclipse.ui.IFolderLayout;
 import org.eclipse.ui.IPageLayout;
 import org.eclipse.ui.IPerspectiveFactory;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/UserHomePerspective.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/UserHomePerspective.java
similarity index 83%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/UserHomePerspective.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/UserHomePerspective.java
index 9f4ee1066..86caad9c4 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/UserHomePerspective.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/UserHomePerspective.java
@@ -13,18 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui;
+package org.argeo.cms.ui.workbench;
 
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
-import org.argeo.security.ui.views.LogView;
-import org.argeo.security.ui.views.UserProfile;
+import org.argeo.cms.ui.workbench.useradmin.LogView;
+import org.argeo.cms.ui.workbench.useradmin.UserProfile;
 import org.eclipse.ui.IFolderLayout;
 import org.eclipse.ui.IPageLayout;
 import org.eclipse.ui.IPerspectiveFactory;
 
 /** Home perspective for the current user */
 public class UserHomePerspective implements IPerspectiveFactory {
-	public final static String ID = SecurityUiPlugin.PLUGIN_ID
+	public final static String ID = WorkbenchUiPlugin.PLUGIN_ID
 			+ ".userHomePerspective";
 
 	public void createInitialLayout(IPageLayout layout) {
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/SecurityUiPlugin.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/WorkbenchUiPlugin.java
similarity index 95%
rename from org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/SecurityUiPlugin.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/WorkbenchUiPlugin.java
index 279a2b900..18b35ae7d 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/SecurityUiPlugin.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/WorkbenchUiPlugin.java
@@ -38,9 +38,9 @@ import org.osgi.framework.ServiceRegistration;
 /**
  * The activator class controls the plug-in life cycle
  */
-public class SecurityUiPlugin extends AbstractUIPlugin implements ILogListener {
+public class WorkbenchUiPlugin extends AbstractUIPlugin implements ILogListener {
 
-	private final static Log log = LogFactory.getLog(SecurityUiPlugin.class);
+	private final static Log log = LogFactory.getLog(WorkbenchUiPlugin.class);
 
 	private ResourceBundle messages;
 
@@ -63,7 +63,7 @@ public class SecurityUiPlugin extends AbstractUIPlugin implements ILogListener {
 	private ServiceRegistration<CallbackHandler> defaultCallbackHandlerReg;
 
 	// The shared instance
-	private static SecurityUiPlugin plugin;
+	private static WorkbenchUiPlugin plugin;
 
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
@@ -95,7 +95,7 @@ public class SecurityUiPlugin extends AbstractUIPlugin implements ILogListener {
 	// *
 	// * @return the shared instance
 	// */
-	public static SecurityUiPlugin getDefault() {
+	public static WorkbenchUiPlugin getDefault() {
 		return plugin;
 	}
 
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/DoNothing.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/commands/DoNothing.java
similarity index 67%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/DoNothing.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/commands/DoNothing.java
index 1a1808ae3..c8a107627 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/DoNothing.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/commands/DoNothing.java
@@ -1,13 +1,13 @@
-package org.argeo.eclipse.ui.workbench.commands;
+package org.argeo.cms.ui.workbench.commands;
 
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 
 /** Utilitary command to enable sub menus in various toolbars. Does nothing */
 public class DoNothing extends AbstractHandler {
-	public final static String ID = SecurityUiPlugin.PLUGIN_ID + ".doNothing";
+	public final static String ID = WorkbenchUiPlugin.PLUGIN_ID + ".doNothing";
 
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		return null;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/commands/OpenChangePasswordDialog.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/commands/OpenChangePasswordDialog.java
similarity index 99%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/commands/OpenChangePasswordDialog.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/commands/OpenChangePasswordDialog.java
index 817354f70..d48291f38 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/commands/OpenChangePasswordDialog.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/commands/OpenChangePasswordDialog.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui.commands;
+package org.argeo.cms.ui.workbench.commands;
 
 import static org.argeo.cms.CmsMsg.changePassword;
 import static org.argeo.cms.CmsMsg.currentPassword;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/OpenEditor.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/commands/OpenEditor.java
similarity index 81%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/OpenEditor.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/commands/OpenEditor.java
index eb7deb02d..ecf84c351 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/OpenEditor.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/commands/OpenEditor.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.commands;
+package org.argeo.cms.ui.workbench.commands;
 
 import javax.jcr.Node;
 
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
+import org.argeo.cms.ui.workbench.internal.jcr.parts.JcrQueryEditorInput;
+import org.argeo.cms.ui.workbench.internal.jcr.parts.NodeEditorInput;
+import org.argeo.cms.ui.workbench.jcr.DefaultNodeEditor;
+import org.argeo.cms.ui.workbench.jcr.GenericJcrQueryEditor;
 import org.argeo.eclipse.ui.EclipseUiException;
-import org.argeo.eclipse.ui.workbench.internal.jcr.parts.JcrQueryEditorInput;
-import org.argeo.eclipse.ui.workbench.internal.jcr.parts.NodeEditorInput;
-import org.argeo.eclipse.ui.workbench.jcr.DefaultNodeEditor;
-import org.argeo.eclipse.ui.workbench.jcr.GenericJcrQueryEditor;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
@@ -32,7 +32,7 @@ import org.eclipse.ui.handlers.HandlerUtil;
 
 /** Open a {@link Node} editor of a specific type given the node path */
 public class OpenEditor extends AbstractHandler {
-	public final static String ID = SecurityUiPlugin.PLUGIN_ID + ".openEditor";
+	public final static String ID = WorkbenchUiPlugin.PLUGIN_ID + ".openEditor";
 
 	public final static String PARAM_PATH = "param.jcrNodePath";
 	public final static String PARAM_EDITOR_ID = "param.editorId";
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/OpenFile.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/commands/OpenFile.java
similarity index 93%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/OpenFile.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/commands/OpenFile.java
index c6129db3d..75a90cd6a 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/OpenFile.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/commands/OpenFile.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.commands;
+package org.argeo.cms.ui.workbench.commands;
 
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
 import org.argeo.eclipse.ui.specific.OpenFileService;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
@@ -48,7 +48,7 @@ public class OpenFile extends AbstractHandler {
 	/* DEPENDENCY INJECTION */
 	private String openFileServiceId;
 
-	public final static String ID = SecurityUiPlugin.PLUGIN_ID + ".openFile";
+	public final static String ID = WorkbenchUiPlugin.PLUGIN_ID + ".openFile";
 	public final static String PARAM_FILE_NAME = OpenFileService.PARAM_FILE_NAME;
 	public final static String PARAM_FILE_URI = OpenFileService.PARAM_FILE_URI; // "param.fileURI";
 
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/commands/OpenHomePerspective.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/commands/OpenHomePerspective.java
similarity index 92%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/commands/OpenHomePerspective.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/commands/OpenHomePerspective.java
index f6aa0d19e..0e1983234 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/commands/OpenHomePerspective.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/commands/OpenHomePerspective.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui.commands;
+package org.argeo.cms.ui.workbench.commands;
 
+import org.argeo.cms.ui.workbench.UserHomePerspective;
 import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
-import org.argeo.security.ui.UserHomePerspective;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/WorkbenchConstants.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/WorkbenchConstants.java
similarity index 94%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/WorkbenchConstants.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/WorkbenchConstants.java
index f08b040bf..43cf1074d 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/WorkbenchConstants.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/WorkbenchConstants.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench;
+package org.argeo.cms.ui.workbench.internal;
 
 /** Constants used across the application. */
 public interface WorkbenchConstants {
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/FullVersioningTreeContentProvider.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/FullVersioningTreeContentProvider.java
similarity index 98%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/FullVersioningTreeContentProvider.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/FullVersioningTreeContentProvider.java
index 7e4e2918a..148605ba4 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/FullVersioningTreeContentProvider.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/FullVersioningTreeContentProvider.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.internal.jcr;
+package org.argeo.cms.ui.workbench.internal.jcr;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/GenericNodeDoubleClickListener.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/GenericNodeDoubleClickListener.java
similarity index 87%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/GenericNodeDoubleClickListener.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/GenericNodeDoubleClickListener.java
index 03721af39..4ec44df2c 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/GenericNodeDoubleClickListener.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/GenericNodeDoubleClickListener.java
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.internal.jcr;
+package org.argeo.cms.ui.workbench.internal.jcr;
 
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.jcr.nodetype.NodeType;
 
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
+import org.argeo.cms.ui.workbench.internal.jcr.model.RepositoryElem;
+import org.argeo.cms.ui.workbench.internal.jcr.model.SingleJcrNodeElem;
+import org.argeo.cms.ui.workbench.internal.jcr.model.WorkspaceElem;
+import org.argeo.cms.ui.workbench.internal.jcr.parts.GenericNodeEditorInput;
+import org.argeo.cms.ui.workbench.jcr.DefaultNodeEditor;
 import org.argeo.eclipse.ui.EclipseUiException;
-import org.argeo.eclipse.ui.workbench.internal.jcr.model.RepositoryElem;
-import org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem;
-import org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem;
-import org.argeo.eclipse.ui.workbench.internal.jcr.parts.GenericNodeEditorInput;
-import org.argeo.eclipse.ui.workbench.jcr.DefaultNodeEditor;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -99,7 +99,7 @@ public class GenericNodeDoubleClickListener implements IDoubleClickListener {
 					// fileHandler.openFile(name, id);
 				}
 				GenericNodeEditorInput gnei = new GenericNodeEditorInput(node);
-				SecurityUiPlugin.getDefault().getWorkbench()
+				WorkbenchUiPlugin.getDefault().getWorkbench()
 						.getActiveWorkbenchWindow().getActivePage()
 						.openEditor(gnei, DefaultNodeEditor.ID);
 			} catch (RepositoryException re) {
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/JcrBrowserUtils.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/JcrBrowserUtils.java
similarity index 86%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/JcrBrowserUtils.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/JcrBrowserUtils.java
index 9e3e31878..363ecfbb5 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/JcrBrowserUtils.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/JcrBrowserUtils.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.internal.jcr;
+package org.argeo.cms.ui.workbench.internal.jcr;
 
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
+import org.argeo.cms.ui.workbench.internal.jcr.model.RepositoriesElem;
+import org.argeo.cms.ui.workbench.internal.jcr.model.RepositoryElem;
+import org.argeo.cms.ui.workbench.internal.jcr.model.SingleJcrNodeElem;
+import org.argeo.cms.ui.workbench.internal.jcr.model.WorkspaceElem;
 import org.argeo.eclipse.ui.EclipseUiException;
 import org.argeo.eclipse.ui.TreeParent;
-import org.argeo.eclipse.ui.workbench.internal.jcr.model.RepositoriesElem;
-import org.argeo.eclipse.ui.workbench.internal.jcr.model.RepositoryElem;
-import org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem;
-import org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem;
 
 /** Centralizes useful methods to manage the JCR Browser */
 public class JcrBrowserUtils {
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/NodeContentProvider.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/NodeContentProvider.java
similarity index 96%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/NodeContentProvider.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/NodeContentProvider.java
index be623871e..6b2bbfd28 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/NodeContentProvider.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/NodeContentProvider.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.internal.jcr;
+package org.argeo.cms.ui.workbench.internal.jcr;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -26,9 +26,9 @@ import javax.jcr.RepositoryFactory;
 import javax.jcr.Session;
 import javax.jcr.nodetype.NodeType;
 
+import org.argeo.cms.ui.workbench.internal.jcr.model.RepositoriesElem;
+import org.argeo.cms.ui.workbench.internal.jcr.model.SingleJcrNodeElem;
 import org.argeo.eclipse.ui.TreeParent;
-import org.argeo.eclipse.ui.workbench.internal.jcr.model.RepositoriesElem;
-import org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem;
 import org.argeo.jcr.RepositoryRegister;
 import org.argeo.node.NodeConstants;
 import org.argeo.node.NodeUtils;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/NodeLabelProvider.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/NodeLabelProvider.java
similarity index 89%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/NodeLabelProvider.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/NodeLabelProvider.java
index 34f0398fc..df8a26e7a 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/NodeLabelProvider.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/NodeLabelProvider.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.internal.jcr;
+package org.argeo.cms.ui.workbench.internal.jcr;
 
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
@@ -21,13 +21,13 @@ import javax.jcr.nodetype.NodeType;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.argeo.cms.ui.workbench.internal.jcr.model.RemoteRepositoryElem;
+import org.argeo.cms.ui.workbench.internal.jcr.model.RepositoriesElem;
+import org.argeo.cms.ui.workbench.internal.jcr.model.RepositoryElem;
+import org.argeo.cms.ui.workbench.internal.jcr.model.SingleJcrNodeElem;
+import org.argeo.cms.ui.workbench.internal.jcr.model.WorkspaceElem;
+import org.argeo.cms.ui.workbench.jcr.JcrImages;
 import org.argeo.eclipse.ui.EclipseUiException;
-import org.argeo.eclipse.ui.workbench.internal.jcr.model.RemoteRepositoryElem;
-import org.argeo.eclipse.ui.workbench.internal.jcr.model.RepositoriesElem;
-import org.argeo.eclipse.ui.workbench.internal.jcr.model.RepositoryElem;
-import org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem;
-import org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem;
-import org.argeo.eclipse.ui.workbench.jcr.JcrImages;
 import org.argeo.node.ArgeoTypes;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.swt.graphics.Image;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/PropertiesContentProvider.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/PropertiesContentProvider.java
similarity index 97%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/PropertiesContentProvider.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/PropertiesContentProvider.java
index d0b0e394c..f26f80948 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/PropertiesContentProvider.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/PropertiesContentProvider.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.internal.jcr;
+package org.argeo.cms.ui.workbench.internal.jcr;
 
 import java.util.Set;
 import java.util.TreeSet;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/PropertyLabelProvider.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/PropertyLabelProvider.java
similarity index 96%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/PropertyLabelProvider.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/PropertyLabelProvider.java
index 34e91f4ca..3014bb6a6 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/PropertyLabelProvider.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/PropertyLabelProvider.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.internal.jcr;
+package org.argeo.cms.ui.workbench.internal.jcr;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -23,8 +23,8 @@ import javax.jcr.PropertyType;
 import javax.jcr.RepositoryException;
 import javax.jcr.Value;
 
+import org.argeo.cms.ui.workbench.internal.WorkbenchConstants;
 import org.argeo.eclipse.ui.EclipseUiException;
-import org.argeo.eclipse.ui.workbench.WorkbenchConstants;
 import org.argeo.jcr.JcrUtils;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.ViewerCell;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/SingleNodeAsTreeContentProvider.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/SingleNodeAsTreeContentProvider.java
similarity index 98%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/SingleNodeAsTreeContentProvider.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/SingleNodeAsTreeContentProvider.java
index 7050b7b89..558e35f40 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/SingleNodeAsTreeContentProvider.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/SingleNodeAsTreeContentProvider.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.internal.jcr;
+package org.argeo.cms.ui.workbench.internal.jcr;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/VersionLabelProvider.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/VersionLabelProvider.java
similarity index 96%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/VersionLabelProvider.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/VersionLabelProvider.java
index e6672f2ce..b33af515a 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/VersionLabelProvider.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/VersionLabelProvider.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.internal.jcr;
+package org.argeo.cms.ui.workbench.internal.jcr;
 
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddFolderNode.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/AddFolderNode.java
similarity index 88%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddFolderNode.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/AddFolderNode.java
index 534d15f00..87bf557ad 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddFolderNode.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/AddFolderNode.java
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.commands;
+package org.argeo.cms.ui.workbench.internal.jcr.commands;
 
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.jcr.nodetype.NodeType;
 
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
+import org.argeo.cms.ui.workbench.internal.jcr.model.SingleJcrNodeElem;
+import org.argeo.cms.ui.workbench.internal.jcr.model.WorkspaceElem;
+import org.argeo.cms.ui.workbench.jcr.JcrBrowserView;
 import org.argeo.eclipse.ui.TreeParent;
 import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
 import org.argeo.eclipse.ui.dialogs.SingleValue;
-import org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem;
-import org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem;
-import org.argeo.eclipse.ui.workbench.jcr.JcrBrowserView;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
@@ -44,7 +44,7 @@ import org.eclipse.ui.handlers.HandlerUtil;
  */
 public class AddFolderNode extends AbstractHandler {
 
-	public final static String ID = SecurityUiPlugin.PLUGIN_ID
+	public final static String ID = WorkbenchUiPlugin.PLUGIN_ID
 			+ ".addFolderNode";
 
 	public Object execute(ExecutionEvent event) throws ExecutionException {
@@ -84,7 +84,7 @@ public class AddFolderNode extends AbstractHandler {
 				}
 			}
 		} else {
-			ErrorFeedback.show(SecurityUiPlugin
+			ErrorFeedback.show(WorkbenchUiPlugin
 					.getMessage("errorUnvalidNtFolderNodeType"));
 		}
 		return null;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddPrivileges.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/AddPrivileges.java
similarity index 87%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddPrivileges.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/AddPrivileges.java
index 6deb673c8..d501a6408 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddPrivileges.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/AddPrivileges.java
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.commands;
+package org.argeo.cms.ui.workbench.internal.jcr.commands;
 
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
+import org.argeo.cms.ui.workbench.internal.jcr.model.SingleJcrNodeElem;
+import org.argeo.cms.ui.workbench.internal.jcr.model.WorkspaceElem;
+import org.argeo.cms.ui.workbench.internal.jcr.parts.AddPrivilegeWizard;
 import org.argeo.eclipse.ui.EclipseUiException;
 import org.argeo.eclipse.ui.TreeParent;
 import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
-import org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem;
-import org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem;
-import org.argeo.eclipse.ui.workbench.internal.jcr.parts.AddPrivilegeWizard;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
@@ -36,7 +36,7 @@ import org.osgi.service.useradmin.UserAdmin;
 
 /** Open a dialog to add privileges on the selected node to a chosen group */
 public class AddPrivileges extends AbstractHandler {
-	public final static String ID = SecurityUiPlugin.PLUGIN_ID
+	public final static String ID = WorkbenchUiPlugin.PLUGIN_ID
 			+ ".addPrivileges";
 
 	/* DEPENDENCY INJECTION */
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddRemoteRepository.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/AddRemoteRepository.java
similarity index 97%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddRemoteRepository.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/AddRemoteRepository.java
index 06b6fe4a8..c8a8738a2 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/AddRemoteRepository.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/AddRemoteRepository.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.commands;
+package org.argeo.cms.ui.workbench.internal.jcr.commands;
 
 import java.net.URI;
 import java.util.Hashtable;
@@ -24,10 +24,10 @@ import javax.jcr.RepositoryFactory;
 import javax.jcr.Session;
 import javax.jcr.SimpleCredentials;
 
+import org.argeo.cms.ui.workbench.internal.WorkbenchConstants;
+import org.argeo.cms.ui.workbench.util.CommandUtils;
 import org.argeo.eclipse.ui.EclipseUiException;
 import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
-import org.argeo.eclipse.ui.workbench.CommandUtils;
-import org.argeo.eclipse.ui.workbench.WorkbenchConstants;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.node.ArgeoNames;
 import org.argeo.node.ArgeoTypes;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/CreateWorkspace.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/CreateWorkspace.java
similarity index 88%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/CreateWorkspace.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/CreateWorkspace.java
index a4183bd11..ccccb8ecd 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/CreateWorkspace.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/CreateWorkspace.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.commands;
+package org.argeo.cms.ui.workbench.internal.jcr.commands;
 
 import java.util.Arrays;
 
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
+import org.argeo.cms.ui.workbench.internal.jcr.model.RepositoryElem;
+import org.argeo.cms.ui.workbench.jcr.JcrBrowserView;
 import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
 import org.argeo.eclipse.ui.dialogs.SingleValue;
-import org.argeo.eclipse.ui.workbench.internal.jcr.model.RepositoryElem;
-import org.argeo.eclipse.ui.workbench.jcr.JcrBrowserView;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
@@ -32,7 +32,7 @@ import org.eclipse.ui.handlers.HandlerUtil;
 /** Create a new JCR workspace */
 public class CreateWorkspace extends AbstractHandler {
 
-	public final static String ID = SecurityUiPlugin.PLUGIN_ID
+	public final static String ID = WorkbenchUiPlugin.PLUGIN_ID
 			+ ".addFolderNode";
 
 	public Object execute(ExecutionEvent event) throws ExecutionException {
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/DeleteNodes.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/DeleteNodes.java
similarity index 93%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/DeleteNodes.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/DeleteNodes.java
index 76530484a..219d854b5 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/DeleteNodes.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/DeleteNodes.java
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.commands;
+package org.argeo.cms.ui.workbench.internal.jcr.commands;
 
 import java.util.Iterator;
 
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
+import org.argeo.cms.ui.workbench.internal.jcr.model.SingleJcrNodeElem;
+import org.argeo.cms.ui.workbench.internal.jcr.model.WorkspaceElem;
+import org.argeo.cms.ui.workbench.jcr.JcrBrowserView;
 import org.argeo.eclipse.ui.EclipseUiException;
 import org.argeo.eclipse.ui.TreeParent;
 import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
-import org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem;
-import org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem;
-import org.argeo.eclipse.ui.workbench.jcr.JcrBrowserView;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/DumpNode.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/DumpNode.java
similarity index 90%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/DumpNode.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/DumpNode.java
index 0c7dda062..2414f042b 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/DumpNode.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/DumpNode.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.commands;
+package org.argeo.cms.ui.workbench.internal.jcr.commands;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -29,10 +29,11 @@ import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
+import org.argeo.cms.ui.workbench.commands.OpenFile;
+import org.argeo.cms.ui.workbench.internal.jcr.model.SingleJcrNodeElem;
+import org.argeo.cms.ui.workbench.util.CommandUtils;
 import org.argeo.eclipse.ui.EclipseUiException;
-import org.argeo.eclipse.ui.workbench.CommandUtils;
-import org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem;
 import org.argeo.jcr.JcrUtils;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
@@ -51,7 +52,7 @@ import org.eclipse.ui.handlers.HandlerUtil;
  * single-sourced command.
  */
 public class DumpNode extends AbstractHandler {
-	public final static String ID = SecurityUiPlugin.PLUGIN_ID + ".dumpNode";
+	public final static String ID = WorkbenchUiPlugin.PLUGIN_ID + ".dumpNode";
 
 	private final static DateFormat df = new SimpleDateFormat(
 			"yyyy-MM-dd_HH-mm");
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/EditNode.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/EditNode.java
similarity index 94%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/EditNode.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/EditNode.java
index d97074714..3acd6e827 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/EditNode.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/EditNode.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.commands;
+package org.argeo.cms.ui.workbench.internal.jcr.commands;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -21,8 +21,8 @@ import java.util.Map;
 import javax.jcr.Property;
 import javax.jcr.nodetype.NodeType;
 
+import org.argeo.cms.ui.workbench.internal.jcr.parts.NodeEditorInput;
 import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
-import org.argeo.eclipse.ui.workbench.internal.jcr.parts.NodeEditorInput;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/GetNodeSize.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/GetNodeSize.java
similarity index 90%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/GetNodeSize.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/GetNodeSize.java
index 85fa3cb38..0240e35d1 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/GetNodeSize.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/GetNodeSize.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.commands;
+package org.argeo.cms.ui.workbench.internal.jcr.commands;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -21,10 +21,10 @@ import java.util.List;
 
 import javax.jcr.Node;
 
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
+import org.argeo.cms.ui.workbench.internal.jcr.model.SingleJcrNodeElem;
+import org.argeo.cms.ui.workbench.internal.jcr.model.WorkspaceElem;
 import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
-import org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem;
-import org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem;
 import org.argeo.jcr.JcrUtils;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
@@ -39,7 +39,7 @@ import org.eclipse.ui.handlers.HandlerUtil;
 public class GetNodeSize extends AbstractHandler {
 	// private final static Log log = LogFactory.getLog(GetNodeSize.class);
 
-	public final static String ID = SecurityUiPlugin.PLUGIN_ID + ".getNodeSize";
+	public final static String ID = WorkbenchUiPlugin.PLUGIN_ID + ".getNodeSize";
 
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/ImportFileSystem.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/ImportFileSystem.java
similarity index 84%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/ImportFileSystem.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/ImportFileSystem.java
index 54e847a72..0493ffeb4 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/ImportFileSystem.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/ImportFileSystem.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.commands;
+package org.argeo.cms.ui.workbench.internal.jcr.commands;
 
 import javax.jcr.Node;
 
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
+import org.argeo.cms.ui.workbench.internal.jcr.model.SingleJcrNodeElem;
+import org.argeo.cms.ui.workbench.internal.jcr.model.WorkspaceElem;
+import org.argeo.cms.ui.workbench.internal.jcr.parts.ImportFileSystemWizard;
+import org.argeo.cms.ui.workbench.jcr.JcrBrowserView;
 import org.argeo.eclipse.ui.TreeParent;
 import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
-import org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem;
-import org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem;
-import org.argeo.eclipse.ui.workbench.internal.jcr.parts.ImportFileSystemWizard;
-import org.argeo.eclipse.ui.workbench.jcr.JcrBrowserView;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
@@ -50,7 +50,7 @@ public class ImportFileSystem extends AbstractHandler {
 				} else if (obj instanceof WorkspaceElem) {
 					folder = ((WorkspaceElem) obj).getRootNode();
 				} else {
-					ErrorFeedback.show(SecurityUiPlugin
+					ErrorFeedback.show(WorkbenchUiPlugin
 							.getMessage("warningInvalidNodeToImport"));
 				}
 				if (folder != null) {
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/NodeConfigurableDump.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/NodeConfigurableDump.java
similarity index 97%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/NodeConfigurableDump.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/NodeConfigurableDump.java
index 5e77bef6d..95f4e346c 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/NodeConfigurableDump.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/NodeConfigurableDump.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.commands;
+package org.argeo.cms.ui.workbench.internal.jcr.commands;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -31,10 +31,10 @@ import javax.jcr.Node;
 import javax.jcr.NodeIterator;
 import javax.jcr.RepositoryException;
 
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
+import org.argeo.cms.ui.workbench.internal.jcr.model.SingleJcrNodeElem;
 import org.argeo.eclipse.ui.EclipseUiException;
 import org.argeo.eclipse.ui.EclipseUiUtils;
-import org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem;
 import org.argeo.jcr.JcrUtils;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
@@ -64,7 +64,7 @@ import org.eclipse.ui.handlers.HandlerUtil;
  * retrieve business data from live systems to prepare migration or test locally
  */
 public class NodeConfigurableDump extends AbstractHandler {
-	public final static String ID = SecurityUiPlugin.PLUGIN_ID
+	public final static String ID = WorkbenchUiPlugin.PLUGIN_ID
 			+ ".nodeConfigurableDump";
 
 	private final static DateFormat df = new SimpleDateFormat(
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/Refresh.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/Refresh.java
similarity index 81%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/Refresh.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/Refresh.java
index b08736270..51b2a1d92 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/Refresh.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/Refresh.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.commands;
+package org.argeo.cms.ui.workbench.internal.jcr.commands;
 
 import java.util.Iterator;
 
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
+import org.argeo.cms.ui.workbench.internal.jcr.JcrBrowserUtils;
+import org.argeo.cms.ui.workbench.jcr.JcrBrowserView;
 import org.argeo.eclipse.ui.TreeParent;
-import org.argeo.eclipse.ui.workbench.internal.jcr.JcrBrowserUtils;
-import org.argeo.eclipse.ui.workbench.jcr.JcrBrowserView;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
@@ -37,15 +37,15 @@ import org.eclipse.jface.viewers.IStructuredSelection;
  */
 public class Refresh extends AbstractHandler {
 
-	public final static String ID = SecurityUiPlugin.PLUGIN_ID + ".refresh";
+	public final static String ID = WorkbenchUiPlugin.PLUGIN_ID + ".refresh";
 
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 
-		JcrBrowserView view = (JcrBrowserView) SecurityUiPlugin.getDefault()
+		JcrBrowserView view = (JcrBrowserView) WorkbenchUiPlugin.getDefault()
 				.getWorkbench().getActiveWorkbenchWindow().getActivePage()
 				.getActivePart();//
 
-		ISelection selection = SecurityUiPlugin.getDefault().getWorkbench()
+		ISelection selection = WorkbenchUiPlugin.getDefault().getWorkbench()
 				.getActiveWorkbenchWindow().getActivePage().getSelection();
 
 		if (selection != null && selection instanceof IStructuredSelection
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/RemovePrivileges.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/RemovePrivileges.java
similarity index 94%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/RemovePrivileges.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/RemovePrivileges.java
index 9a6841d31..3e78a4b4a 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/RemovePrivileges.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/RemovePrivileges.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.commands;
+package org.argeo.cms.ui.workbench.internal.jcr.commands;
 
 import java.security.Principal;
 
@@ -25,14 +25,14 @@ import javax.jcr.security.AccessControlList;
 import javax.jcr.security.AccessControlManager;
 import javax.jcr.security.Privilege;
 
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
+import org.argeo.cms.ui.workbench.internal.jcr.model.SingleJcrNodeElem;
+import org.argeo.cms.ui.workbench.internal.jcr.model.WorkspaceElem;
+import org.argeo.cms.ui.workbench.jcr.JcrImages;
 import org.argeo.eclipse.ui.EclipseUiException;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.eclipse.ui.TreeParent;
 import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
-import org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem;
-import org.argeo.eclipse.ui.workbench.internal.jcr.model.WorkspaceElem;
-import org.argeo.eclipse.ui.workbench.jcr.JcrImages;
 import org.argeo.jcr.JcrUtils;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
@@ -57,7 +57,7 @@ import org.eclipse.ui.handlers.HandlerUtil;
 
 /** Open a dialog to remove privileges from the selected node */
 public class RemovePrivileges extends AbstractHandler {
-	public final static String ID = SecurityUiPlugin.PLUGIN_ID
+	public final static String ID = WorkbenchUiPlugin.PLUGIN_ID
 			+ ".removePrivileges";
 
 	public Object execute(ExecutionEvent event) throws ExecutionException {
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/RemoveRemoteRepository.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/RemoveRemoteRepository.java
similarity index 89%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/RemoveRemoteRepository.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/RemoveRemoteRepository.java
index 8f6f58f41..cd49bf0c1 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/RemoveRemoteRepository.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/RemoveRemoteRepository.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.commands;
+package org.argeo.cms.ui.workbench.internal.jcr.commands;
 
-import org.argeo.eclipse.ui.workbench.internal.jcr.model.RemoteRepositoryElem;
-import org.argeo.eclipse.ui.workbench.jcr.JcrBrowserView;
+import org.argeo.cms.ui.workbench.internal.jcr.model.RemoteRepositoryElem;
+import org.argeo.cms.ui.workbench.jcr.JcrBrowserView;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/RenameNode.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/RenameNode.java
similarity index 90%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/RenameNode.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/RenameNode.java
index 6710a0abc..fefc551cf 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/RenameNode.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/RenameNode.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.commands;
+package org.argeo.cms.ui.workbench.internal.jcr.commands;
 
 import java.util.Iterator;
 
@@ -21,11 +21,11 @@ import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
+import org.argeo.cms.ui.workbench.internal.jcr.model.SingleJcrNodeElem;
+import org.argeo.cms.ui.workbench.jcr.JcrBrowserView;
 import org.argeo.eclipse.ui.EclipseUiException;
 import org.argeo.eclipse.ui.dialogs.SingleValue;
-import org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem;
-import org.argeo.eclipse.ui.workbench.jcr.JcrBrowserView;
 import org.argeo.jcr.JcrUtils;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
@@ -42,7 +42,7 @@ import org.eclipse.ui.handlers.HandlerUtil;
  * The user must then fill a new name in and confirm
  */
 public class RenameNode extends AbstractHandler {
-	public final static String ID = SecurityUiPlugin.PLUGIN_ID + ".renameNode";
+	public final static String ID = WorkbenchUiPlugin.PLUGIN_ID + ".renameNode";
 
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		IWorkbenchPage iwp = HandlerUtil.getActiveWorkbenchWindow(event)
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/SortChildNodes.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/SortChildNodes.java
similarity index 88%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/SortChildNodes.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/SortChildNodes.java
index 4d2ca6fdc..4b3d6f308 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/SortChildNodes.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/SortChildNodes.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.commands;
+package org.argeo.cms.ui.workbench.internal.jcr.commands;
 
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
-import org.argeo.eclipse.ui.workbench.jcr.JcrBrowserView;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
+import org.argeo.cms.ui.workbench.jcr.JcrBrowserView;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.Command;
 import org.eclipse.core.commands.ExecutionEvent;
@@ -28,7 +28,7 @@ import org.eclipse.ui.handlers.HandlerUtil;
 
 /** Change isSorted state of the DataExplorer Browser */
 public class SortChildNodes extends AbstractHandler {
-	public final static String ID = SecurityUiPlugin.PLUGIN_ID
+	public final static String ID = WorkbenchUiPlugin.PLUGIN_ID
 			+ ".sortChildNodes";
 
 	public Object execute(ExecutionEvent event) throws ExecutionException {
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/MaintainedRepositoryElem.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/model/MaintainedRepositoryElem.java
similarity index 90%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/MaintainedRepositoryElem.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/model/MaintainedRepositoryElem.java
index 92cd0b1b5..bebdc66dc 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/MaintainedRepositoryElem.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/model/MaintainedRepositoryElem.java
@@ -1,4 +1,4 @@
-package org.argeo.eclipse.ui.workbench.internal.jcr.model;
+package org.argeo.cms.ui.workbench.internal.jcr.model;
 
 import javax.jcr.Repository;
 
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/RemoteRepositoryElem.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/model/RemoteRepositoryElem.java
similarity index 97%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/RemoteRepositoryElem.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/model/RemoteRepositoryElem.java
index edaf2396f..f34f4de24 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/RemoteRepositoryElem.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/model/RemoteRepositoryElem.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.internal.jcr.model;
+package org.argeo.cms.ui.workbench.internal.jcr.model;
 
 import java.util.Arrays;
 
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/RepositoriesElem.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/model/RepositoriesElem.java
similarity index 98%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/RepositoriesElem.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/model/RepositoriesElem.java
index 294757acd..7a162c18f 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/RepositoriesElem.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/model/RepositoriesElem.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.internal.jcr.model;
+package org.argeo.cms.ui.workbench.internal.jcr.model;
 
 import java.util.Map;
 
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/RepositoryElem.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/model/RepositoryElem.java
similarity index 98%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/RepositoryElem.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/model/RepositoryElem.java
index f3b73b042..6657adfd0 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/RepositoryElem.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/model/RepositoryElem.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.internal.jcr.model;
+package org.argeo.cms.ui.workbench.internal.jcr.model;
 
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/SingleJcrNodeElem.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/model/SingleJcrNodeElem.java
similarity index 98%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/SingleJcrNodeElem.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/model/SingleJcrNodeElem.java
index b69a4803a..c27a13c2f 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/SingleJcrNodeElem.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/model/SingleJcrNodeElem.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.internal.jcr.model;
+package org.argeo.cms.ui.workbench.internal.jcr.model;
 
 import javax.jcr.Node;
 import javax.jcr.NodeIterator;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/WorkspaceElem.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/model/WorkspaceElem.java
similarity index 98%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/WorkspaceElem.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/model/WorkspaceElem.java
index e0e9a3e22..0bbd774d5 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/model/WorkspaceElem.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/model/WorkspaceElem.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.internal.jcr.model;
+package org.argeo.cms.ui.workbench.internal.jcr.model;
 
 import javax.jcr.Node;
 import javax.jcr.NodeIterator;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/AbstractJcrQueryEditor.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/AbstractJcrQueryEditor.java
similarity index 99%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/AbstractJcrQueryEditor.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/AbstractJcrQueryEditor.java
index 0633454ce..27c7cdb15 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/AbstractJcrQueryEditor.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/AbstractJcrQueryEditor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.internal.jcr.parts;
+package org.argeo.cms.ui.workbench.internal.jcr.parts;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/AddPrivilegeWizard.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/AddPrivilegeWizard.java
similarity index 97%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/AddPrivilegeWizard.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/AddPrivilegeWizard.java
index 1837ee7b7..0e6c34c55 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/AddPrivilegeWizard.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/AddPrivilegeWizard.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.internal.jcr.parts;
+package org.argeo.cms.ui.workbench.internal.jcr.parts;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -23,10 +23,10 @@ import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.security.Privilege;
 
+import org.argeo.cms.ui.workbench.internal.useradmin.UsersUtils;
+import org.argeo.cms.ui.workbench.useradmin.PickUpUserDialog;
 import org.argeo.eclipse.ui.EclipseUiException;
 import org.argeo.eclipse.ui.EclipseUiUtils;
-import org.argeo.eclipse.ui.workbench.internal.users.UsersUtils;
-import org.argeo.eclipse.ui.workbench.users.PickUpUserDialog;
 import org.argeo.jcr.JcrUtils;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.window.Window;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/ChildNodesPage.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/ChildNodesPage.java
similarity index 88%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/ChildNodesPage.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/ChildNodesPage.java
index a115e6140..e6422a1e7 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/ChildNodesPage.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/ChildNodesPage.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.internal.jcr.parts;
+package org.argeo.cms.ui.workbench.internal.jcr.parts;
 
 import javax.jcr.Node;
 
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
+import org.argeo.cms.ui.workbench.internal.jcr.NodeLabelProvider;
+import org.argeo.cms.ui.workbench.internal.jcr.SingleNodeAsTreeContentProvider;
+import org.argeo.cms.ui.workbench.jcr.DefaultNodeEditor;
 import org.argeo.eclipse.ui.EclipseUiException;
 import org.argeo.eclipse.ui.EclipseUiUtils;
-import org.argeo.eclipse.ui.workbench.internal.jcr.NodeLabelProvider;
-import org.argeo.eclipse.ui.workbench.internal.jcr.SingleNodeAsTreeContentProvider;
-import org.argeo.eclipse.ui.workbench.jcr.DefaultNodeEditor;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -60,14 +60,14 @@ public class ChildNodesPage extends FormPage {
 	protected void createFormContent(IManagedForm managedForm) {
 		try {
 			ScrolledForm form = managedForm.getForm();
-			form.setText(SecurityUiPlugin.getMessage("childNodesPageTitle"));
+			form.setText(WorkbenchUiPlugin.getMessage("childNodesPageTitle"));
 			Composite body = form.getBody();
 			GridLayout twt = new GridLayout(1, false);
 			twt.marginWidth = twt.marginHeight = 5;
 			body.setLayout(twt);
 			if (!currentNode.hasNodes()) {
 				managedForm.getToolkit().createLabel(body,
-						SecurityUiPlugin.getMessage("warningNoChildNode"));
+						WorkbenchUiPlugin.getMessage("warningNoChildNode"));
 			} else {
 				nodeContentProvider = new SingleNodeAsTreeContentProvider();
 				nodesViewer = createNodeViewer(body, nodeContentProvider);
@@ -104,7 +104,7 @@ public class ChildNodesPage extends FormPage {
 				try {
 					GenericNodeEditorInput gnei = new GenericNodeEditorInput(
 							node);
-					SecurityUiPlugin.getDefault().getWorkbench()
+					WorkbenchUiPlugin.getDefault().getWorkbench()
 							.getActiveWorkbenchWindow().getActivePage()
 							.openEditor(gnei, DefaultNodeEditor.ID);
 				} catch (PartInitException pie) {
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/ChooseNameDialog.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/ChooseNameDialog.java
similarity index 97%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/ChooseNameDialog.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/ChooseNameDialog.java
index 0c6bcb88e..8d786e822 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/ChooseNameDialog.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/ChooseNameDialog.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.internal.jcr.parts;
+package org.argeo.cms.ui.workbench.internal.jcr.parts;
 
 import org.eclipse.jface.dialogs.IMessageProvider;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/EmptyNodePage.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/EmptyNodePage.java
similarity index 96%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/EmptyNodePage.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/EmptyNodePage.java
index a79f779a0..cd3f75648 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/EmptyNodePage.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/EmptyNodePage.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.internal.jcr.parts;
+package org.argeo.cms.ui.workbench.internal.jcr.parts;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridLayout;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/GenericNodeEditorInput.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/GenericNodeEditorInput.java
similarity index 97%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/GenericNodeEditorInput.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/GenericNodeEditorInput.java
index e54ad6333..c87127b89 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/GenericNodeEditorInput.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/GenericNodeEditorInput.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.internal.jcr.parts;
+package org.argeo.cms.ui.workbench.internal.jcr.parts;
 
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/GenericNodePage.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/GenericNodePage.java
similarity index 98%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/GenericNodePage.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/GenericNodePage.java
index 13bc676fa..ea1a64402 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/GenericNodePage.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/GenericNodePage.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.internal.jcr.parts;
+package org.argeo.cms.ui.workbench.internal.jcr.parts;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -28,8 +28,8 @@ import javax.jcr.PropertyIterator;
 import javax.jcr.PropertyType;
 import javax.jcr.RepositoryException;
 
+import org.argeo.cms.ui.workbench.internal.WorkbenchConstants;
 import org.argeo.eclipse.ui.EclipseUiException;
-import org.argeo.eclipse.ui.workbench.WorkbenchConstants;
 import org.argeo.jcr.JcrUtils;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/GenericPropertyPage.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/GenericPropertyPage.java
similarity index 96%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/GenericPropertyPage.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/GenericPropertyPage.java
index 6aad31526..9e236524e 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/GenericPropertyPage.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/GenericPropertyPage.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.internal.jcr.parts;
+package org.argeo.cms.ui.workbench.internal.jcr.parts;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,10 +24,10 @@ import javax.jcr.PropertyIterator;
 import javax.jcr.RepositoryException;
 import javax.jcr.Value;
 
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
+import org.argeo.cms.ui.workbench.internal.WorkbenchConstants;
+import org.argeo.cms.ui.workbench.internal.jcr.PropertyLabelProvider;
 import org.argeo.eclipse.ui.EclipseUiException;
-import org.argeo.eclipse.ui.workbench.WorkbenchConstants;
-import org.argeo.eclipse.ui.workbench.internal.jcr.PropertyLabelProvider;
 import org.eclipse.jface.layout.TreeColumnLayout;
 import org.eclipse.jface.viewers.ColumnWeightData;
 import org.eclipse.jface.viewers.ITreeContentProvider;
@@ -61,7 +61,7 @@ public class GenericPropertyPage extends FormPage implements WorkbenchConstants
 
 	protected void createFormContent(IManagedForm managedForm) {
 		ScrolledForm form = managedForm.getForm();
-		form.setText(SecurityUiPlugin.getMessage("genericNodePageTitle"));
+		form.setText(WorkbenchUiPlugin.getMessage("genericNodePageTitle"));
 
 		Composite body = form.getBody();
 		FillLayout layout = new FillLayout();
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/ImportFileSystemWizard.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/ImportFileSystemWizard.java
similarity index 99%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/ImportFileSystemWizard.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/ImportFileSystemWizard.java
index 5ac403cce..a93dd5649 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/ImportFileSystemWizard.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/ImportFileSystemWizard.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.internal.jcr.parts;
+package org.argeo.cms.ui.workbench.internal.jcr.parts;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/JcrQueryEditorInput.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/JcrQueryEditorInput.java
similarity index 96%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/JcrQueryEditorInput.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/JcrQueryEditorInput.java
index e533dd7ce..5de33ff88 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/JcrQueryEditorInput.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/JcrQueryEditorInput.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.internal.jcr.parts;
+package org.argeo.cms.ui.workbench.internal.jcr.parts;
 
 import javax.jcr.query.Query;
 
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/NodeEditorInput.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/NodeEditorInput.java
similarity index 96%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/NodeEditorInput.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/NodeEditorInput.java
index c562fe971..ccda09995 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/NodeEditorInput.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/NodeEditorInput.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.internal.jcr.parts;
+package org.argeo.cms.ui.workbench.internal.jcr.parts;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.IEditorInput;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/NodePrivilegesPage.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/NodePrivilegesPage.java
similarity index 98%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/NodePrivilegesPage.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/NodePrivilegesPage.java
index 0d53c53c7..c1dc7fa0e 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/NodePrivilegesPage.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/NodePrivilegesPage.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.internal.jcr.parts;
+package org.argeo.cms.ui.workbench.internal.jcr.parts;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -23,7 +23,7 @@ import javax.jcr.NodeIterator;
 import javax.jcr.RepositoryException;
 import javax.jcr.Value;
 
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
 import org.argeo.eclipse.ui.EclipseUiException;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
@@ -59,7 +59,7 @@ public class NodePrivilegesPage extends FormPage {
 
 	protected void createFormContent(IManagedForm managedForm) {
 		ScrolledForm form = managedForm.getForm();
-		form.setText(SecurityUiPlugin
+		form.setText(WorkbenchUiPlugin
 				.getMessage("nodeRightsManagementPageTitle"));
 		FillLayout layout = new FillLayout();
 		layout.marginHeight = 5;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/NodeVersionHistoryPage.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/NodeVersionHistoryPage.java
similarity index 93%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/NodeVersionHistoryPage.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/NodeVersionHistoryPage.java
index 76a81c7c6..4e3d9932a 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/NodeVersionHistoryPage.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/NodeVersionHistoryPage.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.internal.jcr.parts;
+package org.argeo.cms.ui.workbench.internal.jcr.parts;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -33,12 +33,12 @@ import javax.jcr.version.VersionHistory;
 import javax.jcr.version.VersionIterator;
 import javax.jcr.version.VersionManager;
 
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
+import org.argeo.cms.ui.workbench.internal.WorkbenchConstants;
+import org.argeo.cms.ui.workbench.internal.jcr.FullVersioningTreeContentProvider;
+import org.argeo.cms.ui.workbench.internal.jcr.GenericNodeDoubleClickListener;
+import org.argeo.cms.ui.workbench.internal.jcr.VersionLabelProvider;
 import org.argeo.eclipse.ui.EclipseUiException;
-import org.argeo.eclipse.ui.workbench.WorkbenchConstants;
-import org.argeo.eclipse.ui.workbench.internal.jcr.FullVersioningTreeContentProvider;
-import org.argeo.eclipse.ui.workbench.internal.jcr.GenericNodeDoubleClickListener;
-import org.argeo.eclipse.ui.workbench.internal.jcr.VersionLabelProvider;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.jcr.PropertyDiff;
 import org.argeo.jcr.VersionDiff;
@@ -88,7 +88,7 @@ public class NodeVersionHistoryPage extends FormPage implements
 
 	protected void createFormContent(IManagedForm managedForm) {
 		ScrolledForm form = managedForm.getForm();
-		form.setText(SecurityUiPlugin.getMessage("nodeVersionHistoryPageTitle"));
+		form.setText(WorkbenchUiPlugin.getMessage("nodeVersionHistoryPageTitle"));
 		tk = managedForm.getToolkit();
 		GridLayout twt = new GridLayout(1, false);
 		twt.marginWidth = twt.marginHeight = 5;
@@ -98,7 +98,7 @@ public class NodeVersionHistoryPage extends FormPage implements
 		try {
 			if (!currentNode.isNodeType(NodeType.MIX_VERSIONABLE)) {
 				tk.createLabel(body,
-						SecurityUiPlugin.getMessage("warningUnversionableNode"));
+						WorkbenchUiPlugin.getMessage("warningUnversionableNode"));
 			} else {
 				createHistorySection(form.getBody());
 				createTreeSection(form.getBody());
@@ -113,7 +113,7 @@ public class NodeVersionHistoryPage extends FormPage implements
 		// Section Layout & MetaData
 		Section section = tk.createSection(parent, Section.TWISTIE);
 		section.setLayoutData(new GridData(GridData.FILL_BOTH));
-		section.setText(SecurityUiPlugin.getMessage("versionTreeSectionTitle"));
+		section.setText(WorkbenchUiPlugin.getMessage("versionTreeSectionTitle"));
 
 		// Section Body
 		Composite body = tk.createComposite(section, SWT.FILL);
@@ -155,7 +155,7 @@ public class NodeVersionHistoryPage extends FormPage implements
 		section.setLayout(twt);
 
 		// Set title of the section
-		section.setText(SecurityUiPlugin
+		section.setText(WorkbenchUiPlugin
 				.getMessage("versionHistorySectionTitle"));
 
 		final Text styledText = tk.createText(section, "", SWT.FULL_SELECTION
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/StringNodeEditorInput.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/StringNodeEditorInput.java
similarity index 98%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/StringNodeEditorInput.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/StringNodeEditorInput.java
index e93b7ea73..3740debe6 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/jcr/parts/StringNodeEditorInput.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/StringNodeEditorInput.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.internal.jcr.parts;
+package org.argeo.cms.ui.workbench.internal.jcr.parts;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.IEditorInput;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/PartStateChanged.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/PartStateChanged.java
similarity index 96%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/PartStateChanged.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/PartStateChanged.java
index aacf6ef63..cac43b1b0 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/PartStateChanged.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/PartStateChanged.java
@@ -1,4 +1,4 @@
-package org.argeo.security.ui.admin.internal;
+package org.argeo.cms.ui.workbench.internal.useradmin;
 
 import org.argeo.cms.CmsException;
 import org.eclipse.swt.widgets.Display;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/SecurityAdminImages.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/SecurityAdminImages.java
similarity index 81%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/SecurityAdminImages.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/SecurityAdminImages.java
index e2bb69920..ebb45e23a 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/SecurityAdminImages.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/SecurityAdminImages.java
@@ -24,9 +24,9 @@
  * combination shall include the source code for the parts of such software
  * which are used as well as that of the covered work.
  */
-package org.argeo.security.ui.admin;
+package org.argeo.cms.ui.workbench.internal.useradmin;
 
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.graphics.Image;
 
@@ -34,15 +34,15 @@ import org.eclipse.swt.graphics.Image;
 public class SecurityAdminImages {
 	private final static String PREFIX = "icons/";
 
-	public final static ImageDescriptor ICON_REMOVE_DESC = SecurityUiPlugin
+	public final static ImageDescriptor ICON_REMOVE_DESC = WorkbenchUiPlugin
 			.getImageDescriptor(PREFIX + "remove.gif");
-	public final static ImageDescriptor ICON_USER_DESC = SecurityUiPlugin
+	public final static ImageDescriptor ICON_USER_DESC = WorkbenchUiPlugin
 			.getImageDescriptor(PREFIX + "user.gif");
 
 	public final static Image ICON_USER = ICON_USER_DESC.createImage();
-	public final static Image ICON_GROUP = SecurityUiPlugin.getImageDescriptor(
+	public final static Image ICON_GROUP = WorkbenchUiPlugin.getImageDescriptor(
 			PREFIX + "users.gif").createImage();
-	public final static Image ICON_ROLE = SecurityUiPlugin.getImageDescriptor(
+	public final static Image ICON_ROLE = WorkbenchUiPlugin.getImageDescriptor(
 			PREFIX + "role.gif").createImage();
 
 }
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/UiAdminUtils.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/UiAdminUtils.java
similarity index 88%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/UiAdminUtils.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/UiAdminUtils.java
index 871877a0e..96b984a1d 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/UiAdminUtils.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/UiAdminUtils.java
@@ -1,9 +1,9 @@
-package org.argeo.security.ui.admin.internal;
+package org.argeo.cms.ui.workbench.internal.useradmin;
 
 import javax.transaction.UserTransaction;
 
 import org.argeo.cms.CmsException;
-import org.argeo.security.ui.admin.internal.providers.UserTransactionProvider;
+import org.argeo.cms.ui.workbench.internal.useradmin.providers.UserTransactionProvider;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.services.ISourceProviderService;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/UiUserAdminListener.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/UiUserAdminListener.java
similarity index 92%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/UiUserAdminListener.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/UiUserAdminListener.java
index 98c983683..e51d69048 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/UiUserAdminListener.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/UiUserAdminListener.java
@@ -1,4 +1,4 @@
-package org.argeo.security.ui.admin.internal;
+package org.argeo.cms.ui.workbench.internal.useradmin;
 
 import org.eclipse.swt.widgets.Display;
 import org.osgi.service.useradmin.UserAdminEvent;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/UserAdminWrapper.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/UserAdminWrapper.java
similarity index 97%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/UserAdminWrapper.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/UserAdminWrapper.java
index d443a3d47..2f59e8642 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/UserAdminWrapper.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/UserAdminWrapper.java
@@ -1,4 +1,4 @@
-package org.argeo.security.ui.admin.internal;
+package org.argeo.cms.ui.workbench.internal.useradmin;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/users/UsersImages.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/UsersImages.java
similarity index 73%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/users/UsersImages.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/UsersImages.java
index c1b4d5753..bf739a7f6 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/users/UsersImages.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/UsersImages.java
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.internal.users;
+package org.argeo.cms.ui.workbench.internal.useradmin;
 
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
 import org.eclipse.swt.graphics.Image;
 
 /** Specific users icons. TODO centralize and use an image registry */
 public class UsersImages {
 	private final static String PREFIX = "icons/";
 
-	public final static Image ICON_USER = SecurityUiPlugin.getImageDescriptor(
+	public final static Image ICON_USER = WorkbenchUiPlugin.getImageDescriptor(
 			PREFIX + "user.gif").createImage();
-	public final static Image ICON_GROUP = SecurityUiPlugin.getImageDescriptor(
+	public final static Image ICON_GROUP = WorkbenchUiPlugin.getImageDescriptor(
 			PREFIX + "users.gif").createImage();
-	public final static Image ICON_ROLE = SecurityUiPlugin.getImageDescriptor(
+	public final static Image ICON_ROLE = WorkbenchUiPlugin.getImageDescriptor(
 			PREFIX + "role.gif").createImage();
 }
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/users/UsersUtils.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/UsersUtils.java
similarity index 98%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/users/UsersUtils.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/UsersUtils.java
index 397ecdebd..7edfb8118 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/internal/users/UsersUtils.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/UsersUtils.java
@@ -1,4 +1,4 @@
-package org.argeo.eclipse.ui.workbench.internal.users;
+package org.argeo.cms.ui.workbench.internal.useradmin;
 
 import java.security.AccessController;
 import java.util.List;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/DeleteGroups.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/DeleteGroups.java
similarity index 91%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/DeleteGroups.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/DeleteGroups.java
index ff6ff038d..16128b8a4 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/DeleteGroups.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/DeleteGroups.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui.admin.internal.commands;
+package org.argeo.cms.ui.workbench.internal.useradmin.commands;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
+import org.argeo.cms.ui.workbench.internal.useradmin.UserAdminWrapper;
+import org.argeo.cms.ui.workbench.internal.useradmin.parts.UserEditorInput;
 import org.argeo.cms.util.useradmin.UserAdminUtils;
-import org.argeo.security.ui.admin.internal.UserAdminWrapper;
-import org.argeo.security.ui.admin.internal.parts.UserEditorInput;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
@@ -38,7 +38,7 @@ import org.osgi.service.useradmin.UserAdminEvent;
 
 /** Delete the selected groups */
 public class DeleteGroups extends AbstractHandler {
-	public final static String ID = SecurityUiPlugin.PLUGIN_ID
+	public final static String ID = WorkbenchUiPlugin.PLUGIN_ID
 			+ ".deleteGroups";
 
 	/* DEPENDENCY INJECTION */
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/DeleteUsers.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/DeleteUsers.java
similarity index 90%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/DeleteUsers.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/DeleteUsers.java
index cb2fcb071..d2c34b55d 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/DeleteUsers.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/DeleteUsers.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui.admin.internal.commands;
+package org.argeo.cms.ui.workbench.internal.useradmin.commands;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
+import org.argeo.cms.ui.workbench.internal.useradmin.UserAdminWrapper;
+import org.argeo.cms.ui.workbench.internal.useradmin.parts.UserEditorInput;
 import org.argeo.cms.util.useradmin.UserAdminUtils;
-import org.argeo.security.ui.admin.internal.UserAdminWrapper;
-import org.argeo.security.ui.admin.internal.parts.UserEditorInput;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
@@ -38,7 +38,7 @@ import org.osgi.service.useradmin.UserAdminEvent;
 
 /** Delete the selected users */
 public class DeleteUsers extends AbstractHandler {
-	public final static String ID = SecurityUiPlugin.PLUGIN_ID + ".deleteUsers";
+	public final static String ID = WorkbenchUiPlugin.PLUGIN_ID + ".deleteUsers";
 
 	/* DEPENDENCY INJECTION */
 	private UserAdminWrapper userAdminWrapper;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/ForceRefresh.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/ForceRefresh.java
similarity index 87%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/ForceRefresh.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/ForceRefresh.java
index 231c8718a..30483ae45 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/ForceRefresh.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/ForceRefresh.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui.admin.internal.commands;
+package org.argeo.cms.ui.workbench.internal.useradmin.commands;
 
-import org.argeo.security.ui.admin.internal.parts.GroupsView;
-import org.argeo.security.ui.admin.internal.parts.UsersView;
+import org.argeo.cms.ui.workbench.internal.useradmin.parts.GroupsView;
+import org.argeo.cms.ui.workbench.internal.useradmin.parts.UsersView;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/NewGroup.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/NewGroup.java
similarity index 96%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/NewGroup.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/NewGroup.java
index e3abbbc43..48f0016e3 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/NewGroup.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/NewGroup.java
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui.admin.internal.commands;
+package org.argeo.cms.ui.workbench.internal.useradmin.commands;
 
 import java.util.Dictionary;
 import java.util.Map;
 
 import org.argeo.cms.CmsException;
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
+import org.argeo.cms.ui.workbench.internal.useradmin.UserAdminWrapper;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
 import org.argeo.node.ArgeoNames;
 import org.argeo.osgi.useradmin.LdifName;
 import org.argeo.osgi.useradmin.UserAdminConf;
-import org.argeo.security.ui.admin.internal.UserAdminWrapper;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
@@ -48,7 +48,7 @@ import org.osgi.service.useradmin.UserAdminEvent;
 
 /** Create a new group */
 public class NewGroup extends AbstractHandler {
-	public final static String ID = SecurityUiPlugin.PLUGIN_ID + ".newGroup";
+	public final static String ID = WorkbenchUiPlugin.PLUGIN_ID + ".newGroup";
 
 	/* DEPENDENCY INJECTION */
 	private UserAdminWrapper userAdminWrapper;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/NewUser.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/NewUser.java
similarity index 97%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/NewUser.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/NewUser.java
index a7ec2d9b3..c259153f6 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/NewUser.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/NewUser.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui.admin.internal.commands;
+package org.argeo.cms.ui.workbench.internal.useradmin.commands;
 
 import java.util.Dictionary;
 import java.util.List;
@@ -24,14 +24,14 @@ import javax.naming.ldap.LdapName;
 import javax.naming.ldap.Rdn;
 
 import org.argeo.cms.CmsException;
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
+import org.argeo.cms.ui.workbench.internal.useradmin.UserAdminWrapper;
 import org.argeo.cms.util.useradmin.UserAdminUtils;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.eclipse.ui.dialogs.ErrorFeedback;
 import org.argeo.node.ArgeoNames;
 import org.argeo.osgi.useradmin.LdifName;
 import org.argeo.osgi.useradmin.UserAdminConf;
-import org.argeo.security.ui.admin.internal.UserAdminWrapper;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
@@ -62,7 +62,7 @@ public class NewUser extends AbstractHandler {
 	 */
 	public final static String EMAIL_PATTERN = "^[_A-Za-z0-9-]+(\\.[_A-Za-z0-9-]+)*@[A-Za-z0-9-]+(\\.[A-Za-z0-9]+)*(\\.[A-Za-z]{2,})$";
 	// private final static Log log = LogFactory.getLog(NewUser.class);
-	public final static String ID = SecurityUiPlugin.PLUGIN_ID + ".newUser";
+	public final static String ID = WorkbenchUiPlugin.PLUGIN_ID + ".newUser";
 
 	/* DEPENDENCY INJECTION */
 	private UserAdminWrapper userAdminWrapper;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/SaveArgeoUser.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/SaveArgeoUser.java
similarity index 89%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/SaveArgeoUser.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/SaveArgeoUser.java
index b5b394c3d..5d87202a1 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/SaveArgeoUser.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/SaveArgeoUser.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui.admin.internal.commands;
+package org.argeo.cms.ui.workbench.internal.useradmin.commands;
 
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
@@ -27,7 +27,7 @@ import org.eclipse.ui.handlers.HandlerUtil;
 
 /** Save the currently edited Argeo user. */
 public class SaveArgeoUser extends AbstractHandler {
-	public final static String ID = SecurityUiPlugin.PLUGIN_ID
+	public final static String ID = WorkbenchUiPlugin.PLUGIN_ID
 			+ ".saveArgeoUser";
 
 	public Object execute(ExecutionEvent event) throws ExecutionException {
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/UserBatchUpdate.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/UserBatchUpdate.java
similarity index 87%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/UserBatchUpdate.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/UserBatchUpdate.java
index c02f5c220..4aaee0df4 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/UserBatchUpdate.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/UserBatchUpdate.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui.admin.internal.commands;
+package org.argeo.cms.ui.workbench.internal.useradmin.commands;
 
-import org.argeo.security.ui.admin.internal.UserAdminWrapper;
-import org.argeo.security.ui.admin.internal.parts.UserBatchUpdateWizard;
+import org.argeo.cms.ui.workbench.internal.useradmin.UserAdminWrapper;
+import org.argeo.cms.ui.workbench.internal.useradmin.parts.UserBatchUpdateWizard;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/UserTransactionHandler.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/UserTransactionHandler.java
similarity index 90%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/UserTransactionHandler.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/UserTransactionHandler.java
index 85e44c1b3..bcee7f039 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/commands/UserTransactionHandler.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/UserTransactionHandler.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui.admin.internal.commands;
+package org.argeo.cms.ui.workbench.internal.useradmin.commands;
 
 import javax.transaction.Status;
 import javax.transaction.UserTransaction;
 
 import org.argeo.cms.CmsException;
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
-import org.argeo.security.ui.admin.internal.UiAdminUtils;
-import org.argeo.security.ui.admin.internal.UserAdminWrapper;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
+import org.argeo.cms.ui.workbench.internal.useradmin.UiAdminUtils;
+import org.argeo.cms.ui.workbench.internal.useradmin.UserAdminWrapper;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
@@ -29,7 +29,7 @@ import org.osgi.service.useradmin.UserAdminEvent;
 
 /** Manage the transaction that is bound to the current perspective */
 public class UserTransactionHandler extends AbstractHandler {
-	public final static String ID = SecurityUiPlugin.PLUGIN_ID
+	public final static String ID = WorkbenchUiPlugin.PLUGIN_ID
 			+ ".userTransactionHandler";
 
 	public final static String PARAM_COMMAND_ID = "param.commandId";
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/ArgeoUserEditorInput.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/ArgeoUserEditorInput.java
similarity index 96%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/ArgeoUserEditorInput.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/ArgeoUserEditorInput.java
index cca2a1215..d0ed6b45f 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/ArgeoUserEditorInput.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/ArgeoUserEditorInput.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui.admin.internal.parts;
+package org.argeo.cms.ui.workbench.internal.useradmin.parts;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.IEditorInput;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/DefaultUserMainPage.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/DefaultUserMainPage.java
similarity index 99%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/DefaultUserMainPage.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/DefaultUserMainPage.java
index 3fe07f782..6d7f2bf3f 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/DefaultUserMainPage.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/DefaultUserMainPage.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui.admin.internal.parts;
+package org.argeo.cms.ui.workbench.internal.useradmin.parts;
 
 import java.util.Arrays;
 
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/GroupMainPage.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupMainPage.java
similarity index 94%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/GroupMainPage.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupMainPage.java
index b48726f48..0c8e55593 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/GroupMainPage.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupMainPage.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui.admin.internal.parts;
+package org.argeo.cms.ui.workbench.internal.useradmin.parts;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -22,22 +22,22 @@ import java.util.List;
 import javax.transaction.UserTransaction;
 
 import org.argeo.cms.CmsException;
+import org.argeo.cms.ui.workbench.internal.useradmin.SecurityAdminImages;
+import org.argeo.cms.ui.workbench.internal.useradmin.UserAdminWrapper;
+import org.argeo.cms.ui.workbench.internal.useradmin.parts.UserEditor.GroupChangeListener;
+import org.argeo.cms.ui.workbench.internal.useradmin.parts.UserEditor.MainInfoListener;
+import org.argeo.cms.ui.workbench.internal.useradmin.providers.CommonNameLP;
+import org.argeo.cms.ui.workbench.internal.useradmin.providers.MailLP;
+import org.argeo.cms.ui.workbench.internal.useradmin.providers.RoleIconLP;
+import org.argeo.cms.ui.workbench.internal.useradmin.providers.UserFilter;
+import org.argeo.cms.ui.workbench.internal.useradmin.providers.UserNameLP;
+import org.argeo.cms.ui.workbench.internal.useradmin.providers.UserTableDefaultDClickListener;
 import org.argeo.cms.util.useradmin.UserAdminUtils;
 import org.argeo.eclipse.ui.ColumnDefinition;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.eclipse.ui.parts.LdifUsersTable;
 import org.argeo.node.ArgeoNames;
 import org.argeo.osgi.useradmin.LdifName;
-import org.argeo.security.ui.admin.SecurityAdminImages;
-import org.argeo.security.ui.admin.internal.UserAdminWrapper;
-import org.argeo.security.ui.admin.internal.parts.UserEditor.GroupChangeListener;
-import org.argeo.security.ui.admin.internal.parts.UserEditor.MainInfoListener;
-import org.argeo.security.ui.admin.internal.providers.CommonNameLP;
-import org.argeo.security.ui.admin.internal.providers.MailLP;
-import org.argeo.security.ui.admin.internal.providers.RoleIconLP;
-import org.argeo.security.ui.admin.internal.providers.UserFilter;
-import org.argeo.security.ui.admin.internal.providers.UserNameLP;
-import org.argeo.security.ui.admin.internal.providers.UserTableDefaultDClickListener;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.ToolBarManager;
 import org.eclipse.jface.dialogs.MessageDialog;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/GroupsView.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupsView.java
similarity index 90%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/GroupsView.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupsView.java
index f7ad517a5..32bbc9ffb 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/GroupsView.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupsView.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui.admin.internal.parts;
+package org.argeo.cms.ui.workbench.internal.useradmin.parts;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -22,21 +22,21 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.CmsException;
 import org.argeo.cms.auth.AuthConstants;
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
+import org.argeo.cms.ui.workbench.internal.useradmin.UiUserAdminListener;
+import org.argeo.cms.ui.workbench.internal.useradmin.UserAdminWrapper;
+import org.argeo.cms.ui.workbench.internal.useradmin.providers.CommonNameLP;
+import org.argeo.cms.ui.workbench.internal.useradmin.providers.DomainNameLP;
+import org.argeo.cms.ui.workbench.internal.useradmin.providers.RoleIconLP;
+import org.argeo.cms.ui.workbench.internal.useradmin.providers.UserDragListener;
+import org.argeo.cms.ui.workbench.internal.useradmin.providers.UserNameLP;
+import org.argeo.cms.ui.workbench.internal.useradmin.providers.UserTableDefaultDClickListener;
 import org.argeo.cms.util.useradmin.UserAdminUtils;
 import org.argeo.eclipse.ui.ColumnDefinition;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.eclipse.ui.parts.LdifUsersTable;
 import org.argeo.node.ArgeoNames;
 import org.argeo.osgi.useradmin.LdifName;
-import org.argeo.security.ui.admin.internal.UiUserAdminListener;
-import org.argeo.security.ui.admin.internal.UserAdminWrapper;
-import org.argeo.security.ui.admin.internal.providers.CommonNameLP;
-import org.argeo.security.ui.admin.internal.providers.DomainNameLP;
-import org.argeo.security.ui.admin.internal.providers.RoleIconLP;
-import org.argeo.security.ui.admin.internal.providers.UserDragListener;
-import org.argeo.security.ui.admin.internal.providers.UserNameLP;
-import org.argeo.security.ui.admin.internal.providers.UserTableDefaultDClickListener;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.dnd.DND;
@@ -58,7 +58,7 @@ import org.osgi.service.useradmin.UserAdminListener;
 /** List all groups with filter */
 public class GroupsView extends ViewPart implements ArgeoNames {
 	private final static Log log = LogFactory.getLog(GroupsView.class);
-	public final static String ID = SecurityUiPlugin.PLUGIN_ID + ".groupsView";
+	public final static String ID = WorkbenchUiPlugin.PLUGIN_ID + ".groupsView";
 
 	/* DEPENDENCY INJECTION */
 	private UserAdminWrapper userAdminWrapper;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/UserBatchUpdateWizard.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserBatchUpdateWizard.java
similarity index 97%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/UserBatchUpdateWizard.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserBatchUpdateWizard.java
index b532ddef5..984008bf7 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/UserBatchUpdateWizard.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserBatchUpdateWizard.java
@@ -1,4 +1,4 @@
-package org.argeo.security.ui.admin.internal.parts;
+package org.argeo.cms.ui.workbench.internal.useradmin.parts;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -12,17 +12,17 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.CmsException;
 import org.argeo.cms.auth.AuthConstants;
+import org.argeo.cms.ui.workbench.internal.useradmin.UserAdminWrapper;
+import org.argeo.cms.ui.workbench.internal.useradmin.providers.CommonNameLP;
+import org.argeo.cms.ui.workbench.internal.useradmin.providers.DomainNameLP;
+import org.argeo.cms.ui.workbench.internal.useradmin.providers.MailLP;
+import org.argeo.cms.ui.workbench.internal.useradmin.providers.UserNameLP;
 import org.argeo.cms.util.useradmin.UserAdminUtils;
 import org.argeo.eclipse.ui.ColumnDefinition;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.eclipse.ui.parts.LdifUsersTable;
 import org.argeo.node.ArgeoNames;
 import org.argeo.osgi.useradmin.LdifName;
-import org.argeo.security.ui.admin.internal.UserAdminWrapper;
-import org.argeo.security.ui.admin.internal.providers.CommonNameLP;
-import org.argeo.security.ui.admin.internal.providers.DomainNameLP;
-import org.argeo.security.ui.admin.internal.providers.MailLP;
-import org.argeo.security.ui.admin.internal.providers.UserNameLP;
 import org.eclipse.jface.dialogs.IPageChangeProvider;
 import org.eclipse.jface.dialogs.IPageChangedListener;
 import org.eclipse.jface.dialogs.MessageDialog;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/UserEditor.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserEditor.java
similarity index 93%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/UserEditor.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserEditor.java
index f750e67bb..85ed08160 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/UserEditor.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserEditor.java
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui.admin.internal.parts;
+package org.argeo.cms.ui.workbench.internal.useradmin.parts;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.argeo.cms.CmsException;
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
+import org.argeo.cms.ui.workbench.internal.useradmin.UiUserAdminListener;
+import org.argeo.cms.ui.workbench.internal.useradmin.UserAdminWrapper;
 import org.argeo.cms.util.useradmin.UserAdminUtils;
 import org.argeo.osgi.useradmin.LdifName;
-import org.argeo.security.ui.admin.internal.UiUserAdminListener;
-import org.argeo.security.ui.admin.internal.UserAdminWrapper;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
@@ -44,9 +44,9 @@ import org.osgi.service.useradmin.UserAdminEvent;
 public class UserEditor extends FormEditor {
 	private static final long serialVersionUID = 8357851520380820241L;
 
-	public final static String USER_EDITOR_ID = SecurityUiPlugin.PLUGIN_ID
+	public final static String USER_EDITOR_ID = WorkbenchUiPlugin.PLUGIN_ID
 			+ ".userEditor";
-	public final static String GROUP_EDITOR_ID = SecurityUiPlugin.PLUGIN_ID
+	public final static String GROUP_EDITOR_ID = WorkbenchUiPlugin.PLUGIN_ID
 			+ ".groupEditor";
 
 	/* DEPENDENCY INJECTION */
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/UserEditorInput.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserEditorInput.java
similarity index 96%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/UserEditorInput.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserEditorInput.java
index fe129f815..576c53e6d 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/UserEditorInput.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserEditorInput.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui.admin.internal.parts;
+package org.argeo.cms.ui.workbench.internal.useradmin.parts;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.IEditorInput;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/UserMainPage.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserMainPage.java
similarity index 95%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/UserMainPage.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserMainPage.java
index df910ecea..ea0b8784a 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/UserMainPage.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserMainPage.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui.admin.internal.parts;
+package org.argeo.cms.ui.workbench.internal.useradmin.parts;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -21,22 +21,22 @@ import java.util.List;
 
 import org.argeo.cms.CmsException;
 import org.argeo.cms.auth.AuthConstants;
+import org.argeo.cms.ui.workbench.internal.useradmin.SecurityAdminImages;
+import org.argeo.cms.ui.workbench.internal.useradmin.UserAdminWrapper;
+import org.argeo.cms.ui.workbench.internal.useradmin.parts.UserEditor.GroupChangeListener;
+import org.argeo.cms.ui.workbench.internal.useradmin.parts.UserEditor.MainInfoListener;
+import org.argeo.cms.ui.workbench.internal.useradmin.providers.CommonNameLP;
+import org.argeo.cms.ui.workbench.internal.useradmin.providers.DomainNameLP;
+import org.argeo.cms.ui.workbench.internal.useradmin.providers.RoleIconLP;
+import org.argeo.cms.ui.workbench.internal.useradmin.providers.UserFilter;
+import org.argeo.cms.ui.workbench.internal.useradmin.providers.UserNameLP;
+import org.argeo.cms.ui.workbench.internal.useradmin.providers.UserTableDefaultDClickListener;
 import org.argeo.cms.util.useradmin.UserAdminUtils;
 import org.argeo.eclipse.ui.ColumnDefinition;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.eclipse.ui.parts.LdifUsersTable;
 import org.argeo.node.ArgeoNames;
 import org.argeo.osgi.useradmin.LdifName;
-import org.argeo.security.ui.admin.SecurityAdminImages;
-import org.argeo.security.ui.admin.internal.UserAdminWrapper;
-import org.argeo.security.ui.admin.internal.parts.UserEditor.GroupChangeListener;
-import org.argeo.security.ui.admin.internal.parts.UserEditor.MainInfoListener;
-import org.argeo.security.ui.admin.internal.providers.CommonNameLP;
-import org.argeo.security.ui.admin.internal.providers.DomainNameLP;
-import org.argeo.security.ui.admin.internal.providers.RoleIconLP;
-import org.argeo.security.ui.admin.internal.providers.UserFilter;
-import org.argeo.security.ui.admin.internal.providers.UserNameLP;
-import org.argeo.security.ui.admin.internal.providers.UserTableDefaultDClickListener;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.ToolBarManager;
 import org.eclipse.jface.resource.ImageDescriptor;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/UsersView.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UsersView.java
similarity index 87%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/UsersView.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UsersView.java
index a811cd5a5..e4c265461 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/parts/UsersView.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UsersView.java
@@ -13,28 +13,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui.admin.internal.parts;
+package org.argeo.cms.ui.workbench.internal.useradmin.parts;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.argeo.cms.CmsException;
 import org.argeo.cms.auth.AuthConstants;
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
+import org.argeo.cms.ui.workbench.internal.useradmin.UiUserAdminListener;
+import org.argeo.cms.ui.workbench.internal.useradmin.UserAdminWrapper;
+import org.argeo.cms.ui.workbench.internal.useradmin.providers.CommonNameLP;
+import org.argeo.cms.ui.workbench.internal.useradmin.providers.DomainNameLP;
+import org.argeo.cms.ui.workbench.internal.useradmin.providers.MailLP;
+import org.argeo.cms.ui.workbench.internal.useradmin.providers.UserDragListener;
+import org.argeo.cms.ui.workbench.internal.useradmin.providers.UserNameLP;
+import org.argeo.cms.ui.workbench.internal.useradmin.providers.UserTableDefaultDClickListener;
 import org.argeo.cms.util.useradmin.UserAdminUtils;
 import org.argeo.eclipse.ui.ColumnDefinition;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.eclipse.ui.parts.LdifUsersTable;
 import org.argeo.node.ArgeoNames;
 import org.argeo.osgi.useradmin.LdifName;
-import org.argeo.security.ui.admin.internal.UiUserAdminListener;
-import org.argeo.security.ui.admin.internal.UserAdminWrapper;
-import org.argeo.security.ui.admin.internal.providers.CommonNameLP;
-import org.argeo.security.ui.admin.internal.providers.DomainNameLP;
-import org.argeo.security.ui.admin.internal.providers.MailLP;
-import org.argeo.security.ui.admin.internal.providers.UserDragListener;
-import org.argeo.security.ui.admin.internal.providers.UserNameLP;
-import org.argeo.security.ui.admin.internal.providers.UserTableDefaultDClickListener;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.dnd.DND;
@@ -53,7 +53,7 @@ import org.osgi.service.useradmin.UserAdminListener;
 public class UsersView extends ViewPart implements ArgeoNames {
 	// private final static Log log = LogFactory.getLog(UsersView.class);
 
-	public final static String ID = SecurityUiPlugin.PLUGIN_ID + ".usersView";
+	public final static String ID = WorkbenchUiPlugin.PLUGIN_ID + ".usersView";
 
 	/* DEPENDENCY INJECTION */
 	private UserAdminWrapper userAdminWrapper;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/CommonNameLP.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/CommonNameLP.java
similarity index 87%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/CommonNameLP.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/CommonNameLP.java
index d45c0b603..06e8ededa 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/CommonNameLP.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/CommonNameLP.java
@@ -1,4 +1,4 @@
-package org.argeo.security.ui.admin.internal.providers;
+package org.argeo.cms.ui.workbench.internal.useradmin.providers;
 
 import org.argeo.cms.util.useradmin.UserAdminUtils;
 import org.argeo.osgi.useradmin.LdifName;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/DomainNameLP.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/DomainNameLP.java
similarity index 85%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/DomainNameLP.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/DomainNameLP.java
index 795fd0af3..dee40e0d8 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/DomainNameLP.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/DomainNameLP.java
@@ -1,4 +1,4 @@
-package org.argeo.security.ui.admin.internal.providers;
+package org.argeo.cms.ui.workbench.internal.useradmin.providers;
 
 import org.argeo.cms.util.useradmin.UserAdminUtils;
 import org.osgi.service.useradmin.User;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/MailLP.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/MailLP.java
similarity index 87%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/MailLP.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/MailLP.java
index 0a6dcb604..4d52ca114 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/MailLP.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/MailLP.java
@@ -1,4 +1,4 @@
-package org.argeo.security.ui.admin.internal.providers;
+package org.argeo.cms.ui.workbench.internal.useradmin.providers;
 
 import org.argeo.cms.util.useradmin.UserAdminUtils;
 import org.argeo.osgi.useradmin.LdifName;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/RoleIconLP.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/RoleIconLP.java
similarity index 84%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/RoleIconLP.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/RoleIconLP.java
index bb19220a9..125791f4b 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/RoleIconLP.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/RoleIconLP.java
@@ -1,7 +1,7 @@
-package org.argeo.security.ui.admin.internal.providers;
+package org.argeo.cms.ui.workbench.internal.useradmin.providers;
 
 import org.argeo.cms.auth.AuthConstants;
-import org.argeo.security.ui.admin.SecurityAdminImages;
+import org.argeo.cms.ui.workbench.internal.useradmin.SecurityAdminImages;
 import org.eclipse.swt.graphics.Image;
 import org.osgi.service.useradmin.Role;
 import org.osgi.service.useradmin.User;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/UserAdminAbstractLP.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/UserAdminAbstractLP.java
similarity index 96%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/UserAdminAbstractLP.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/UserAdminAbstractLP.java
index 2b0a13db7..c5eeb473f 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/UserAdminAbstractLP.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/UserAdminAbstractLP.java
@@ -1,4 +1,4 @@
-package org.argeo.security.ui.admin.internal.providers;
+package org.argeo.cms.ui.workbench.internal.useradmin.providers;
 
 import javax.naming.InvalidNameException;
 import javax.naming.ldap.LdapName;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/UserDragListener.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/UserDragListener.java
similarity index 94%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/UserDragListener.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/UserDragListener.java
index f60b64c65..ccc76f46a 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/UserDragListener.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/UserDragListener.java
@@ -1,4 +1,4 @@
-package org.argeo.security.ui.admin.internal.providers;
+package org.argeo.cms.ui.workbench.internal.useradmin.providers;
 
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.Viewer;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/UserFilter.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/UserFilter.java
similarity index 96%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/UserFilter.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/UserFilter.java
index 5f753d1c3..624ee546d 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/UserFilter.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/UserFilter.java
@@ -1,4 +1,4 @@
-package org.argeo.security.ui.admin.internal.providers;
+package org.argeo.cms.ui.workbench.internal.useradmin.providers;
 
 import static org.argeo.eclipse.ui.EclipseUiUtils.notEmpty;
 
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/UserNameLP.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/UserNameLP.java
similarity index 82%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/UserNameLP.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/UserNameLP.java
index a2a15c112..0d8e8505b 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/UserNameLP.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/UserNameLP.java
@@ -1,4 +1,4 @@
-package org.argeo.security.ui.admin.internal.providers;
+package org.argeo.cms.ui.workbench.internal.useradmin.providers;
 
 import org.osgi.service.useradmin.User;
 
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/UserTableDefaultDClickListener.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/UserTableDefaultDClickListener.java
similarity index 79%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/UserTableDefaultDClickListener.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/UserTableDefaultDClickListener.java
index 10337bebd..5ae8463ba 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/UserTableDefaultDClickListener.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/UserTableDefaultDClickListener.java
@@ -1,9 +1,9 @@
-package org.argeo.security.ui.admin.internal.providers;
+package org.argeo.cms.ui.workbench.internal.useradmin.providers;
 
 import org.argeo.cms.CmsException;
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
-import org.argeo.security.ui.admin.internal.parts.UserEditor;
-import org.argeo.security.ui.admin.internal.parts.UserEditorInput;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
+import org.argeo.cms.ui.workbench.internal.useradmin.parts.UserEditor;
+import org.argeo.cms.ui.workbench.internal.useradmin.parts.UserEditorInput;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -24,7 +24,7 @@ public class UserTableDefaultDClickListener implements IDoubleClickListener {
 		Object obj = ((IStructuredSelection) evt.getSelection())
 				.getFirstElement();
 		User user = (User) obj;
-		IWorkbenchWindow iww = SecurityUiPlugin.getDefault().getWorkbench()
+		IWorkbenchWindow iww = WorkbenchUiPlugin.getDefault().getWorkbench()
 				.getActiveWorkbenchWindow();
 		IWorkbenchPage iwp = iww.getActivePage();
 		UserEditorInput uei = new UserEditorInput(user.getName());
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/UserTransactionProvider.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/UserTransactionProvider.java
similarity index 91%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/UserTransactionProvider.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/UserTransactionProvider.java
index 33b3cb7c8..9741d21ae 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/internal/providers/UserTransactionProvider.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/UserTransactionProvider.java
@@ -1,4 +1,4 @@
-package org.argeo.security.ui.admin.internal.providers;
+package org.argeo.cms.ui.workbench.internal.useradmin.providers;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -9,7 +9,7 @@ import javax.transaction.UserTransaction;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.cms.CmsException;
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
 import org.eclipse.ui.AbstractSourceProvider;
 import org.eclipse.ui.ISources;
 
@@ -18,7 +18,7 @@ public class UserTransactionProvider extends AbstractSourceProvider {
 	private final static Log log = LogFactory
 			.getLog(UserTransactionProvider.class);
 
-	public final static String TRANSACTION_STATE = SecurityUiPlugin.PLUGIN_ID
+	public final static String TRANSACTION_STATE = WorkbenchUiPlugin.PLUGIN_ID
 			+ ".userTransactionState";
 	public final static String STATUS_ACTIVE = "status.active";
 	public final static String STATUS_NO_TRANSACTION = "status.noTransaction";
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/DefaultNodeEditor.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/jcr/DefaultNodeEditor.java
similarity index 82%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/DefaultNodeEditor.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/jcr/DefaultNodeEditor.java
index fd7302569..e502dd462 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/DefaultNodeEditor.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/jcr/DefaultNodeEditor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.jcr;
+package org.argeo.cms.ui.workbench.jcr;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,14 +24,14 @@ import javax.jcr.nodetype.NodeType;
 import javax.jcr.security.AccessControlManager;
 import javax.jcr.security.Privilege;
 
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
+import org.argeo.cms.ui.workbench.internal.jcr.parts.ChildNodesPage;
+import org.argeo.cms.ui.workbench.internal.jcr.parts.GenericNodeEditorInput;
+import org.argeo.cms.ui.workbench.internal.jcr.parts.GenericNodePage;
+import org.argeo.cms.ui.workbench.internal.jcr.parts.GenericPropertyPage;
+import org.argeo.cms.ui.workbench.internal.jcr.parts.NodePrivilegesPage;
+import org.argeo.cms.ui.workbench.internal.jcr.parts.NodeVersionHistoryPage;
 import org.argeo.eclipse.ui.EclipseUiException;
-import org.argeo.eclipse.ui.workbench.internal.jcr.parts.ChildNodesPage;
-import org.argeo.eclipse.ui.workbench.internal.jcr.parts.GenericNodeEditorInput;
-import org.argeo.eclipse.ui.workbench.internal.jcr.parts.GenericNodePage;
-import org.argeo.eclipse.ui.workbench.internal.jcr.parts.GenericPropertyPage;
-import org.argeo.eclipse.ui.workbench.internal.jcr.parts.NodePrivilegesPage;
-import org.argeo.eclipse.ui.workbench.internal.jcr.parts.NodeVersionHistoryPage;
 import org.argeo.jcr.JcrUtils;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.ui.IEditorInput;
@@ -45,7 +45,7 @@ public class DefaultNodeEditor extends FormEditor {
 
 	// private final static Log log =
 	// LogFactory.getLog(GenericNodeEditor.class);
-	public final static String ID = SecurityUiPlugin.PLUGIN_ID
+	public final static String ID = WorkbenchUiPlugin.PLUGIN_ID
 			+ ".defaultNodeEditor";
 
 	private Node currentNode;
@@ -68,12 +68,12 @@ public class DefaultNodeEditor extends FormEditor {
 	protected void addPages() {
 		try {
 			genericPropertyPage = new GenericPropertyPage(this,
-					SecurityUiPlugin.getMessage("genericNodePageTitle"),
+					WorkbenchUiPlugin.getMessage("genericNodePageTitle"),
 					currentNode);
 			addPage(genericPropertyPage);
 
 			childNodesPage = new ChildNodesPage(this,
-					SecurityUiPlugin.getMessage("childNodesPageTitle"),
+					WorkbenchUiPlugin.getMessage("childNodesPageTitle"),
 					currentNode);
 			addPage(childNodesPage);
 
@@ -85,14 +85,14 @@ public class DefaultNodeEditor extends FormEditor {
 			if (accessControlManager.hasPrivileges(currentNode.getPath(),
 					privileges.toArray(new Privilege[0]))) {
 				nodeRightsManagementPage = new NodePrivilegesPage(this,
-						SecurityUiPlugin
+						WorkbenchUiPlugin
 								.getMessage("nodeRightsManagementPageTitle"),
 						currentNode);
 				addPage(nodeRightsManagementPage);
 			}
 			if (currentNode.isNodeType(NodeType.MIX_VERSIONABLE)) {
 				nodeVersionHistoryPage = new NodeVersionHistoryPage(this,
-						SecurityUiPlugin
+						WorkbenchUiPlugin
 								.getMessage("nodeVersionHistoryPageTitle"),
 						currentNode);
 				addPage(nodeVersionHistoryPage);
@@ -105,7 +105,7 @@ public class DefaultNodeEditor extends FormEditor {
 					privileges.toArray(new Privilege[0]))) {
 				genericNodePage = new GenericNodePage(
 						this,
-						SecurityUiPlugin.getMessage("propertyEditorPageTitle"),
+						WorkbenchUiPlugin.getMessage("propertyEditorPageTitle"),
 						currentNode);
 				addPage(genericNodePage);
 			}
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/GenericJcrQueryEditor.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/jcr/GenericJcrQueryEditor.java
similarity index 88%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/GenericJcrQueryEditor.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/jcr/GenericJcrQueryEditor.java
index 653db977b..7c7f2b97b 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/GenericJcrQueryEditor.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/jcr/GenericJcrQueryEditor.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.jcr;
+package org.argeo.cms.ui.workbench.jcr;
 
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
-import org.argeo.eclipse.ui.workbench.internal.jcr.parts.AbstractJcrQueryEditor;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
+import org.argeo.cms.ui.workbench.internal.jcr.parts.AbstractJcrQueryEditor;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -28,7 +28,7 @@ import org.eclipse.swt.widgets.Text;
 
 /** Enables end user to type and execute any JCR query. */
 public class GenericJcrQueryEditor extends AbstractJcrQueryEditor {
-	public final static String ID = SecurityUiPlugin.PLUGIN_ID
+	public final static String ID = WorkbenchUiPlugin.PLUGIN_ID
 			+ ".genericJcrQueryEditor";
 
 	private Text queryField;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrBrowserView.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/jcr/JcrBrowserView.java
similarity index 94%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrBrowserView.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/jcr/JcrBrowserView.java
index c30082765..e012e0e05 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrBrowserView.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/jcr/JcrBrowserView.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.jcr;
+package org.argeo.cms.ui.workbench.jcr;
 
 import java.util.List;
 
@@ -28,17 +28,17 @@ import javax.jcr.observation.Event;
 import javax.jcr.observation.EventListener;
 import javax.jcr.observation.ObservationManager;
 
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
+import org.argeo.cms.ui.workbench.internal.jcr.GenericNodeDoubleClickListener;
+import org.argeo.cms.ui.workbench.internal.jcr.JcrBrowserUtils;
+import org.argeo.cms.ui.workbench.internal.jcr.NodeContentProvider;
+import org.argeo.cms.ui.workbench.internal.jcr.NodeLabelProvider;
+import org.argeo.cms.ui.workbench.internal.jcr.PropertiesContentProvider;
+import org.argeo.cms.ui.workbench.internal.jcr.model.SingleJcrNodeElem;
 import org.argeo.eclipse.ui.EclipseUiException;
 import org.argeo.eclipse.ui.TreeParent;
 import org.argeo.eclipse.ui.jcr.AsyncUiEventListener;
 import org.argeo.eclipse.ui.jcr.utils.NodeViewerComparer;
-import org.argeo.eclipse.ui.workbench.internal.jcr.GenericNodeDoubleClickListener;
-import org.argeo.eclipse.ui.workbench.internal.jcr.JcrBrowserUtils;
-import org.argeo.eclipse.ui.workbench.internal.jcr.NodeContentProvider;
-import org.argeo.eclipse.ui.workbench.internal.jcr.NodeLabelProvider;
-import org.argeo.eclipse.ui.workbench.internal.jcr.PropertiesContentProvider;
-import org.argeo.eclipse.ui.workbench.internal.jcr.model.SingleJcrNodeElem;
 import org.argeo.jcr.RepositoryRegister;
 import org.argeo.node.security.Keyring;
 import org.eclipse.jface.action.MenuManager;
@@ -66,7 +66,7 @@ import org.eclipse.ui.part.ViewPart;
  * repository environment
  */
 public class JcrBrowserView extends ViewPart {
-	public final static String ID = SecurityUiPlugin.PLUGIN_ID
+	public final static String ID = WorkbenchUiPlugin.PLUGIN_ID
 			+ ".jcrBrowserView";
 	private boolean sortChildNodes = true;
 
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrImages.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/jcr/JcrImages.java
similarity index 58%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrImages.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/jcr/JcrImages.java
index d117f6e18..d7f7b60c7 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrImages.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/jcr/JcrImages.java
@@ -13,43 +13,43 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.jcr;
+package org.argeo.cms.ui.workbench.jcr;
 
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
 import org.eclipse.swt.graphics.Image;
 
 /** Shared icons. */
 public class JcrImages {
-	public final static Image NODE = SecurityUiPlugin.getImageDescriptor(
+	public final static Image NODE = WorkbenchUiPlugin.getImageDescriptor(
 			"icons/node.gif").createImage();
-	public final static Image FOLDER = SecurityUiPlugin.getImageDescriptor(
+	public final static Image FOLDER = WorkbenchUiPlugin.getImageDescriptor(
 			"icons/folder.gif").createImage();
-	public final static Image FILE = SecurityUiPlugin.getImageDescriptor(
+	public final static Image FILE = WorkbenchUiPlugin.getImageDescriptor(
 			"icons/file.gif").createImage();
-	public final static Image BINARY = SecurityUiPlugin.getImageDescriptor(
+	public final static Image BINARY = WorkbenchUiPlugin.getImageDescriptor(
 			"icons/binary.png").createImage();
-	public final static Image HOME = SecurityUiPlugin.getImageDescriptor(
+	public final static Image HOME = WorkbenchUiPlugin.getImageDescriptor(
 			"icons/home.gif").createImage();
-	public final static Image SORT = SecurityUiPlugin.getImageDescriptor(
+	public final static Image SORT = WorkbenchUiPlugin.getImageDescriptor(
 			"icons/sort.gif").createImage();
-	public final static Image REMOVE = SecurityUiPlugin.getImageDescriptor(
+	public final static Image REMOVE = WorkbenchUiPlugin.getImageDescriptor(
 			"icons/remove.gif").createImage();
 
-	public final static Image REPOSITORIES = SecurityUiPlugin
+	public final static Image REPOSITORIES = WorkbenchUiPlugin
 			.getImageDescriptor("icons/repositories.gif").createImage();
-	public final static Image REPOSITORY_DISCONNECTED = SecurityUiPlugin
+	public final static Image REPOSITORY_DISCONNECTED = WorkbenchUiPlugin
 			.getImageDescriptor("icons/repository_disconnected.gif")
 			.createImage();
-	public final static Image REPOSITORY_CONNECTED = SecurityUiPlugin
+	public final static Image REPOSITORY_CONNECTED = WorkbenchUiPlugin
 			.getImageDescriptor("icons/repository_connected.gif").createImage();
-	public final static Image REMOTE_DISCONNECTED = SecurityUiPlugin
+	public final static Image REMOTE_DISCONNECTED = WorkbenchUiPlugin
 			.getImageDescriptor("icons/remote_disconnected.gif").createImage();
-	public final static Image REMOTE_CONNECTED = SecurityUiPlugin
+	public final static Image REMOTE_CONNECTED = WorkbenchUiPlugin
 			.getImageDescriptor("icons/remote_connected.gif").createImage();
-	public final static Image WORKSPACE_DISCONNECTED = SecurityUiPlugin
+	public final static Image WORKSPACE_DISCONNECTED = WorkbenchUiPlugin
 			.getImageDescriptor("icons/workspace_disconnected.png")
 			.createImage();
-	public final static Image WORKSPACE_CONNECTED = SecurityUiPlugin
+	public final static Image WORKSPACE_CONNECTED = WorkbenchUiPlugin
 			.getImageDescriptor("icons/workspace_connected.png").createImage();
 
 }
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrPreferenceStore.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/jcr/JcrPreferenceStore.java
similarity index 99%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrPreferenceStore.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/jcr/JcrPreferenceStore.java
index 406baf929..d1917d908 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/jcr/JcrPreferenceStore.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/jcr/JcrPreferenceStore.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.jcr;
+package org.argeo.cms.ui.workbench.jcr;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/BundleNode.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/osgi/BundleNode.java
similarity index 95%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/BundleNode.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/osgi/BundleNode.java
index 8661331b2..4bbe7a5a6 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/BundleNode.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/osgi/BundleNode.java
@@ -1,4 +1,4 @@
-package org.argeo.eclipse.ui.workbench.osgi;
+package org.argeo.cms.ui.workbench.osgi;
 
 import org.argeo.eclipse.ui.TreeParent;
 import org.osgi.framework.Bundle;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/BundlesView.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/osgi/BundlesView.java
similarity index 96%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/BundlesView.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/osgi/BundlesView.java
index 3894810f6..bb1531997 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/BundlesView.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/osgi/BundlesView.java
@@ -16,11 +16,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.osgi;
+package org.argeo.cms.ui.workbench.osgi;
 
 import java.util.Comparator;
 
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
 import org.argeo.eclipse.ui.ColumnViewerComparator;
 import org.argeo.eclipse.ui.specific.EclipseUiSpecificUtils;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
@@ -113,7 +113,7 @@ public class BundlesView extends ViewPart {
 			}
 		});
 
-		viewer.setInput(SecurityUiPlugin.getDefault().getBundle()
+		viewer.setInput(WorkbenchUiPlugin.getDefault().getBundle()
 				.getBundleContext());
 
 	}
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/ModulesView.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/osgi/ModulesView.java
similarity index 95%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/ModulesView.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/osgi/ModulesView.java
index dec1b2b14..235261a58 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/ModulesView.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/osgi/ModulesView.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.osgi;
+package org.argeo.cms.ui.workbench.osgi;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
 import org.argeo.eclipse.ui.TreeParent;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.TreeViewer;
@@ -38,7 +38,7 @@ public class ModulesView extends ViewPart {
 		viewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
 		viewer.setContentProvider(new ModulesContentProvider());
 		viewer.setLabelProvider(new ModulesLabelProvider());
-		viewer.setInput(SecurityUiPlugin.getDefault().getBundle()
+		viewer.setInput(WorkbenchUiPlugin.getDefault().getBundle()
 				.getBundleContext());
 	}
 
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/MultiplePackagesView.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/osgi/MultiplePackagesView.java
similarity index 97%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/MultiplePackagesView.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/osgi/MultiplePackagesView.java
index b6a18c483..a7f9a5335 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/MultiplePackagesView.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/osgi/MultiplePackagesView.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.osgi;
+package org.argeo.cms.ui.workbench.osgi;
 
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -24,7 +24,7 @@ import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
 
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
 import org.argeo.eclipse.ui.TreeParent;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.LabelProvider;
@@ -58,7 +58,7 @@ public class MultiplePackagesView extends ViewPart {
 		viewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
 		viewer.setContentProvider(new ModulesContentProvider());
 		viewer.setLabelProvider(new LabelProvider());
-		viewer.setInput(SecurityUiPlugin.getDefault().getBundle()
+		viewer.setInput(WorkbenchUiPlugin.getDefault().getBundle()
 				.getBundleContext());
 	}
 
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/OsgiExplorerImages.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/osgi/OsgiExplorerImages.java
similarity index 66%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/OsgiExplorerImages.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/osgi/OsgiExplorerImages.java
index 1070c9013..1233e11e6 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/OsgiExplorerImages.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/osgi/OsgiExplorerImages.java
@@ -13,23 +13,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.osgi;
+package org.argeo.cms.ui.workbench.osgi;
 
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
 import org.eclipse.swt.graphics.Image;
 
 /** Shared icons. */
 public class OsgiExplorerImages {
-	public final static Image INSTALLED = SecurityUiPlugin.getImageDescriptor(
+	public final static Image INSTALLED = WorkbenchUiPlugin.getImageDescriptor(
 			"icons/installed.gif").createImage();
-	public final static Image RESOLVED = SecurityUiPlugin.getImageDescriptor(
+	public final static Image RESOLVED = WorkbenchUiPlugin.getImageDescriptor(
 			"icons/resolved.gif").createImage();
-	public final static Image STARTING = SecurityUiPlugin.getImageDescriptor(
+	public final static Image STARTING = WorkbenchUiPlugin.getImageDescriptor(
 			"icons/starting.gif").createImage();
-	public final static Image ACTIVE = SecurityUiPlugin.getImageDescriptor(
+	public final static Image ACTIVE = WorkbenchUiPlugin.getImageDescriptor(
 			"icons/active.gif").createImage();
-	public final static Image SERVICE_PUBLISHED = SecurityUiPlugin
+	public final static Image SERVICE_PUBLISHED = WorkbenchUiPlugin
 			.getImageDescriptor("icons/service_published.gif").createImage();
-	public final static Image SERVICE_REFERENCED = SecurityUiPlugin
+	public final static Image SERVICE_REFERENCED = WorkbenchUiPlugin
 			.getImageDescriptor("icons/service_referenced.gif").createImage();
 }
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/ServiceReferenceNode.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/osgi/ServiceReferenceNode.java
similarity index 96%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/ServiceReferenceNode.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/osgi/ServiceReferenceNode.java
index 0da5287f3..6b4972d6d 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/ServiceReferenceNode.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/osgi/ServiceReferenceNode.java
@@ -1,4 +1,4 @@
-package org.argeo.eclipse.ui.workbench.osgi;
+package org.argeo.cms.ui.workbench.osgi;
 
 import org.argeo.eclipse.ui.TreeParent;
 import org.osgi.framework.Bundle;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/StateLabelProvider.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/osgi/StateLabelProvider.java
similarity index 98%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/StateLabelProvider.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/osgi/StateLabelProvider.java
index 803a35871..0edd6a00f 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/osgi/StateLabelProvider.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/osgi/StateLabelProvider.java
@@ -1,4 +1,4 @@
-package org.argeo.eclipse.ui.workbench.osgi;
+package org.argeo.cms.ui.workbench.osgi;
 
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.swt.graphics.Image;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/views/AdminLogView.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/AdminLogView.java
similarity index 93%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/views/AdminLogView.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/AdminLogView.java
index cb3b02f41..c3e3ca744 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/views/AdminLogView.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/AdminLogView.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui.views;
+package org.argeo.cms.ui.workbench.useradmin;
 
 import java.util.ArrayList;
 
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
 import org.argeo.node.ArgeoLogger;
 import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.viewers.LabelProvider;
@@ -32,7 +32,7 @@ import org.eclipse.ui.part.ViewPart;
  * Display log lines for all users with a virtual table.
  */
 public class AdminLogView extends ViewPart {
-	public static String ID = SecurityUiPlugin.PLUGIN_ID + ".adminLogView";
+	public static String ID = WorkbenchUiPlugin.PLUGIN_ID + ".adminLogView";
 
 	private TableViewer viewer;
 
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/views/LogContentProvider.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/LogContentProvider.java
similarity index 99%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/views/LogContentProvider.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/LogContentProvider.java
index 5b12f439a..6df7ad515 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/views/LogContentProvider.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/LogContentProvider.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui.views;
+package org.argeo.cms.ui.workbench.useradmin;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/views/LogView.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/LogView.java
similarity index 92%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/views/LogView.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/LogView.java
index 50d44416b..07c808d3e 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/views/LogView.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/LogView.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui.views;
+package org.argeo.cms.ui.workbench.useradmin;
 
 import java.util.ArrayList;
 
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
 import org.argeo.node.ArgeoLogListener;
 import org.argeo.node.ArgeoLogger;
 import org.eclipse.jface.resource.JFaceResources;
@@ -34,7 +34,7 @@ import org.eclipse.ui.part.ViewPart;
  * {@link ArgeoLogListener} via OSGi services.
  */
 public class LogView extends ViewPart {
-	public static String ID = SecurityUiPlugin.PLUGIN_ID + ".logView";
+	public static String ID = WorkbenchUiPlugin.PLUGIN_ID + ".logView";
 
 	private TableViewer viewer;
 
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/users/PickUpUserDialog.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/PickUpUserDialog.java
similarity index 98%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/users/PickUpUserDialog.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/PickUpUserDialog.java
index b74af70bc..aa2312829 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/users/PickUpUserDialog.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/PickUpUserDialog.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench.users;
+package org.argeo.cms.ui.workbench.useradmin;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import org.argeo.cms.ui.workbench.internal.useradmin.UsersUtils;
 import org.argeo.eclipse.ui.ColumnDefinition;
 import org.argeo.eclipse.ui.EclipseUiException;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.eclipse.ui.parts.LdifUsersTable;
-import org.argeo.eclipse.ui.workbench.internal.users.UsersUtils;
 import org.argeo.osgi.useradmin.LdifName;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.dialogs.TrayDialog;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/users/UserLP.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/UserLP.java
similarity index 93%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/users/UserLP.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/UserLP.java
index 0340f8dfe..592af3cd5 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/users/UserLP.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/UserLP.java
@@ -1,11 +1,11 @@
-package org.argeo.eclipse.ui.workbench.users;
+package org.argeo.cms.ui.workbench.useradmin;
 
 import javax.naming.InvalidNameException;
 import javax.naming.ldap.LdapName;
 
+import org.argeo.cms.ui.workbench.internal.useradmin.UsersImages;
+import org.argeo.cms.ui.workbench.internal.useradmin.UsersUtils;
 import org.argeo.eclipse.ui.EclipseUiException;
-import org.argeo.eclipse.ui.workbench.internal.users.UsersImages;
-import org.argeo.eclipse.ui.workbench.internal.users.UsersUtils;
 import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.swt.SWT;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/views/UserProfile.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/UserProfile.java
similarity index 93%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/views/UserProfile.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/UserProfile.java
index b7b929b88..c5a39c152 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/views/UserProfile.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/UserProfile.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui.views;
+package org.argeo.cms.ui.workbench.useradmin;
 
 import java.util.TreeSet;
 
 import org.argeo.cms.auth.CurrentUser;
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.LabelProvider;
@@ -33,7 +33,7 @@ import org.eclipse.ui.part.ViewPart;
 
 /** Information about the currently logged in user */
 public class UserProfile extends ViewPart {
-	public static String ID = SecurityUiPlugin.PLUGIN_ID + ".userProfile";
+	public static String ID = WorkbenchUiPlugin.PLUGIN_ID + ".userProfile";
 
 	private TableViewer viewer;
 
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/CommandUtils.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/util/CommandUtils.java
similarity index 97%
rename from org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/CommandUtils.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/util/CommandUtils.java
index 1cb369eb1..4845f317d 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/CommandUtils.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/util/CommandUtils.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.eclipse.ui.workbench;
+package org.argeo.cms.ui.workbench.util;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.argeo.cms.ui.workbench.SecurityUiPlugin;
+import org.argeo.cms.ui.workbench.WorkbenchUiPlugin;
 import org.argeo.eclipse.ui.EclipseUiException;
 import org.eclipse.core.commands.Command;
 import org.eclipse.core.commands.Parameterization;
@@ -144,7 +144,7 @@ public class CommandUtils {
 	public static void callCommand(String commandID,
 			Map<String, String> paramMap) {
 		try {
-			IWorkbench iw = SecurityUiPlugin.getDefault().getWorkbench();
+			IWorkbench iw = WorkbenchUiPlugin.getDefault().getWorkbench();
 			IHandlerService handlerService = (IHandlerService) iw
 					.getService(IHandlerService.class);
 			ICommandService cmdService = (ICommandService) iw
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/PrivilegedJob.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/util/PrivilegedJob.java
similarity index 96%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/PrivilegedJob.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/util/PrivilegedJob.java
index 3a9ade427..c232f03fd 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/PrivilegedJob.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/util/PrivilegedJob.java
@@ -1,4 +1,4 @@
-package org.argeo.security.ui;
+package org.argeo.cms.ui.workbench.util;
 
 import java.security.AccessControlContext;
 import java.security.AccessController;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/RolesSourceProvider.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/util/RolesSourceProvider.java
similarity index 97%
rename from org.argeo.cms.ui.workbench/src/org/argeo/security/ui/RolesSourceProvider.java
rename to org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/util/RolesSourceProvider.java
index 42e6f10e7..4bf0d342d 100644
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/RolesSourceProvider.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/util/RolesSourceProvider.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.argeo.security.ui;
+package org.argeo.cms.ui.workbench.util;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/ErrorFeedback.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/ErrorFeedback.java
deleted file mode 100644
index e7e9c3bd8..000000000
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/ErrorFeedback.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2007-2012 Argeo GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.argeo.eclipse.ui.workbench;
-
-import org.eclipse.swt.widgets.Shell;
-
-/** @deprecated Use {@link org.argeo.eclipse.ui.dialogs.ErrorFeedback} instead. */
-@Deprecated
-public class ErrorFeedback extends org.argeo.eclipse.ui.dialogs.ErrorFeedback {
-	private static final long serialVersionUID = 5346084648745909554L;
-
-	public ErrorFeedback(Shell parentShell, String message, Throwable e) {
-		super(parentShell, message, e);
-	}
-
-}
\ No newline at end of file
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/WorkbenchUiPlugin.java b/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/WorkbenchUiPlugin.java
deleted file mode 100644
index e45c9a050..000000000
--- a/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/ui/workbench/WorkbenchUiPlugin.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (C) 2007-2012 Argeo GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.argeo.eclipse.ui.workbench;
-
-public class WorkbenchUiPlugin {
-}
-
-// /**
-// * The activator class controls the plug-in life cycle
-// */
-// public class SecurityUiPlugin extends AbstractUIPlugin implements
-// ILogListener {
-// private final static Log log = LogFactory.getLog(SecurityUiPlugin.class);
-// private ResourceBundle messages;
-//
-// // The plug-in ID
-//	public static final String ID = "org.argeo.eclipse.ui.workbench"; //$NON-NLS-1$
-//
-// // The shared instance
-// private static SecurityUiPlugin plugin;
-//
-// /**
-// * The constructor
-// */
-// public SecurityUiPlugin() {
-// }
-//
-// public void start(BundleContext context) throws Exception {
-// super.start(context);
-// plugin = this;
-// messages = ResourceBundle.getBundle(ID + ".messages");
-// Platform.addLogListener(this);
-// if (log.isTraceEnabled())
-// log.trace("Eclipse logging now directed to standard logging");
-// }
-//
-// public void stop(BundleContext context) throws Exception {
-// try {
-// Platform.removeLogListener(this);
-// if (log.isTraceEnabled())
-// log.trace("Eclipse logging not directed anymore to standard logging");
-// plugin = null;
-// } finally {
-// super.stop(context);
-// }
-// }
-//
-// /**
-// * Returns the shared instance
-// *
-// * @return the shared instance
-// */
-// public static SecurityUiPlugin getDefault() {
-// return plugin;
-// }
-//
-// public static ImageDescriptor getImageDescriptor(String path) {
-// return imageDescriptorFromPlugin(ID, path);
-// }
-//
-// /** Returns the internationalized label for the given key */
-// public static String getMessage(String key) {
-// try {
-// return getDefault().messages.getString(key);
-// } catch (NullPointerException npe) {
-// log.warn(key + " not found.");
-// return key;
-// }
-// }
-//
-// /**
-// * Gives access to the internationalization message bundle. Returns null in
-// * case this UiPlugin is not started (for JUnit tests, by instance)
-// */
-// public static ResourceBundle getMessagesBundle() {
-// if (getDefault() != null)
-// // To avoid NPE
-// return getDefault().messages;
-// else
-// return null;
-// }
-//
-// public void logging(IStatus status, String plugin) {
-// Log pluginLog = LogFactory.getLog(plugin);
-// Integer severity = status.getSeverity();
-// if (severity == IStatus.ERROR)
-// pluginLog.error(status.getMessage(), status.getException());
-// else if (severity == IStatus.WARNING)
-// pluginLog.warn(status.getMessage(), status.getException());
-// else if (severity == IStatus.INFO)
-// pluginLog.info(status.getMessage(), status.getException());
-// else if (severity == IStatus.CANCEL)
-// if (pluginLog.isDebugEnabled())
-// pluginLog.debug(status.getMessage(), status.getException());
-// }
-// }
diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/SecurityAdminPlugin.java b/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/SecurityAdminPlugin.java
deleted file mode 100644
index 7222f9234..000000000
--- a/org.argeo.cms.ui.workbench/src/org/argeo/security/ui/admin/SecurityAdminPlugin.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2007-2012 Argeo GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.argeo.security.ui.admin;
-
-public class SecurityAdminPlugin{}
-
-// public class SecurityAdminPlugin extends AbstractUIPlugin {
-//	public static final String PLUGIN_ID = "org.argeo.security.ui.admin"; //$NON-NLS-1$
-// private static SecurityAdminPlugin plugin;
-// private static BundleContext bundleContext;
-//
-// public SecurityAdminPlugin() {
-// }
-//
-// public void start(BundleContext context) throws Exception {
-// super.start(context);
-// plugin = this;
-// bundleContext = context;
-// }
-//
-// public void stop(BundleContext context) throws Exception {
-// plugin = null;
-// bundleContext = null;
-// super.stop(context);
-// }
-//
-// public static SecurityAdminPlugin getDefault() {
-// return plugin;
-// }
-//
-// public static BundleContext getBundleContext() {
-// return bundleContext;
-// }
-//
-// public static ImageDescriptor getImageDescriptor(String path) {
-// return imageDescriptorFromPlugin(PLUGIN_ID, path);
-// }
-//
-// }
-- 
2.30.2