import javax.annotation.PostConstruct;
import org.argeo.api.cms.CmsSession;
-import org.argeo.cms.auth.RoleNameUtils;
+import org.argeo.cms.RoleNameUtils;
import org.argeo.cms.util.LangUtils;
import org.argeo.eclipse.ui.ColumnViewerComparator;
import org.argeo.eclipse.ui.specific.EclipseUiSpecificUtils;
import java.util.Map;
import org.argeo.api.cms.CmsConstants;
+import org.argeo.api.cms.directory.UserDirectory;
import org.argeo.api.cms.transaction.WorkTransaction;
-import org.argeo.cms.osgi.useradmin.UserDirectory;
import org.argeo.cms.runtime.DirectoryConf;
import org.argeo.cms.swt.CmsException;
import org.osgi.service.useradmin.UserAdmin;