diff --git a/src/main/java/org/olat/catalog/ui/CatalogController.java b/src/main/java/org/olat/catalog/ui/CatalogController.java
index e83709de85e3d1a9f69aa2a95e324723fac05147..73d564decda31d898eb430e152678eda5202762c 100644
--- a/src/main/java/org/olat/catalog/ui/CatalogController.java
+++ b/src/main/java/org/olat/catalog/ui/CatalogController.java
@@ -75,15 +75,15 @@ import org.olat.core.util.resource.OresHelper;
 import org.olat.core.util.vfs.VFSLeaf;
 import org.olat.modules.co.ContactFormController;
 import org.olat.repository.RepositoryEntry;
-import org.olat.repository.RepositoryEntryIconRenderer;
 import org.olat.repository.RepositoryManager;
 import org.olat.repository.RepositoryService;
-import org.olat.repository.RepositoryTableModel;
-import org.olat.repository.SearchRepositoryEntryParameters;
 import org.olat.repository.controllers.EntryChangedEvent;
-import org.olat.repository.controllers.RepositoryEditDescriptionController;
 import org.olat.repository.controllers.RepositorySearchController;
+import org.olat.repository.model.SearchRepositoryEntryParameters;
 import org.olat.repository.ui.PriceMethod;
+import org.olat.repository.ui.RepositoryEntryIconRenderer;
+import org.olat.repository.ui.RepositoryTableModel;
+import org.olat.repository.ui.author.RepositoryEditDescriptionController;
 import org.olat.resource.OLATResource;
 import org.olat.resource.accesscontrol.ACService;
 import org.olat.resource.accesscontrol.model.OLATResourceAccess;
diff --git a/src/main/java/org/olat/commons/calendar/restapi/UserCalendarWebService.java b/src/main/java/org/olat/commons/calendar/restapi/UserCalendarWebService.java
index fd8675405e3a016d47a427919e284e6c5aa7cdb1..eda77926fd370d83b63eb4432cf0242c8d649e4b 100644
--- a/src/main/java/org/olat/commons/calendar/restapi/UserCalendarWebService.java
+++ b/src/main/java/org/olat/commons/calendar/restapi/UserCalendarWebService.java
@@ -72,7 +72,7 @@ import org.olat.group.BusinessGroupService;
 import org.olat.group.model.SearchBusinessGroupParams;
 import org.olat.repository.RepositoryEntry;
 import org.olat.repository.RepositoryManager;
-import org.olat.repository.SearchRepositoryEntryParameters;
+import org.olat.repository.model.SearchRepositoryEntryParameters;
 import org.olat.resource.accesscontrol.ACService;
 import org.olat.resource.accesscontrol.AccessResult;
 
diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/FormUIFactory.java b/src/main/java/org/olat/core/gui/components/form/flexible/FormUIFactory.java
index 15d489cabd7524db430d4175d543aa7ecf961f0a..95e6c514542de441e6fe702f5e7c2e269f55f828 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/FormUIFactory.java
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/FormUIFactory.java
@@ -875,8 +875,8 @@ public class FormUIFactory {
 	}
 	
 	public FlexiTableElement addTableElement(UserRequest ureq, WindowControl wControl, String name, FlexiTableDataModel<?> tableModel,
-			int pageSize, Translator translator, FormItemContainer formLayout) {
-		FlexiTableElementImpl fte = new FlexiTableElementImpl(ureq, wControl, name, translator, tableModel, pageSize);
+			int pageSize, boolean loadOnInit, Translator translator, FormItemContainer formLayout) {
+		FlexiTableElementImpl fte = new FlexiTableElementImpl(ureq, wControl, name, translator, tableModel, pageSize, loadOnInit);
 		formLayout.add(fte);
 		return fte;
 	}
diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/FlexiTableElementImpl.java b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/FlexiTableElementImpl.java
index 2e876db09412af24a111175eb50aed69653af4bb..7b11ee3983f1cc00cededc750f39c2fcfaaf14c3 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/FlexiTableElementImpl.java
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/FlexiTableElementImpl.java
@@ -127,15 +127,15 @@ public class FlexiTableElementImpl extends FormItemImpl implements FlexiTableEle
 	private Map<String,FormItem> components = new HashMap<String,FormItem>();
 	
 	public FlexiTableElementImpl(UserRequest ureq, WindowControl wControl, String name, FlexiTableDataModel<?> tableModel) {
-		this(ureq, wControl, name, null, tableModel, -1);
+		this(ureq, wControl, name, null, tableModel, -1, true);
 	}
 	
 	public FlexiTableElementImpl(UserRequest ureq, WindowControl wControl, String name, Translator translator, FlexiTableDataModel<?> tableModel) {
-		this(ureq, wControl, name, translator, tableModel, -1);
+		this(ureq, wControl, name, translator, tableModel, -1, true);
 	}
 	
 	public FlexiTableElementImpl(UserRequest ureq, WindowControl wControl, String name, Translator translator,
-			FlexiTableDataModel<?> tableModel, int pageSize) {
+			FlexiTableDataModel<?> tableModel, int pageSize, boolean loadOnStart) {
 		super(name);
 		this.wControl = wControl;
 		this.dataModel = tableModel;
@@ -163,7 +163,7 @@ public class FlexiTableElementImpl extends FormItemImpl implements FlexiTableEle
 			setPage(0);
 		}
 		
-		if(dataSource != null) {
+		if(dataSource != null && loadOnStart) {
 			//preload it
 			dataSource.load(null, null, 0, pageSize);
 		}
diff --git a/src/main/java/org/olat/course/editor/PublishStep01.java b/src/main/java/org/olat/course/editor/PublishStep01.java
index b5f9a7a0a669d44be6528e39c580ec1fea627acb..7e212089cd1250e41b3334a7187c8bc4f26b765d 100644
--- a/src/main/java/org/olat/course/editor/PublishStep01.java
+++ b/src/main/java/org/olat/course/editor/PublishStep01.java
@@ -46,9 +46,9 @@ import org.olat.core.gui.translator.Translator;
 import org.olat.core.util.Util;
 import org.olat.course.ICourse;
 import org.olat.login.LoginModule;
-import org.olat.repository.PropPupForm;
 import org.olat.repository.RepositoryEntry;
 import org.olat.repository.RepositoryModule;
+import org.olat.repository.ui.author.PropPupForm;
 
 /**
  * Description:<br>
diff --git a/src/main/java/org/olat/course/site/CourseSiteContextEntryControllerCreator.java b/src/main/java/org/olat/course/site/CourseSiteContextEntryControllerCreator.java
index ef706b7433be4e166a74100c030f93a8226f4c74..03374754561df07989aafa67e00d37c554735d51 100644
--- a/src/main/java/org/olat/course/site/CourseSiteContextEntryControllerCreator.java
+++ b/src/main/java/org/olat/course/site/CourseSiteContextEntryControllerCreator.java
@@ -36,9 +36,9 @@ import org.olat.course.site.model.CourseSiteConfiguration;
 import org.olat.course.site.model.LanguageConfiguration;
 import org.olat.repository.RepositoryEntry;
 import org.olat.repository.RepositoryManager;
-import org.olat.repository.RepositoyUIFactory;
 import org.olat.repository.handlers.RepositoryHandler;
 import org.olat.repository.handlers.RepositoryHandlerFactory;
+import org.olat.repository.ui.RepositoyUIFactory;
 
 /**
  * <h3>Description:</h3>
diff --git a/src/main/java/org/olat/group/manager/BusinessGroupServiceImpl.java b/src/main/java/org/olat/group/manager/BusinessGroupServiceImpl.java
index 460068a54ea01b1b2ec6311dd9507d233da40b17..08f44953b91a6cb832d2c70384cb73887fbd9b7c 100644
--- a/src/main/java/org/olat/group/manager/BusinessGroupServiceImpl.java
+++ b/src/main/java/org/olat/group/manager/BusinessGroupServiceImpl.java
@@ -105,9 +105,9 @@ import org.olat.repository.RepositoryEntryRef;
 import org.olat.repository.RepositoryEntryRelationType;
 import org.olat.repository.RepositoryEntryShort;
 import org.olat.repository.RepositoryManager;
-import org.olat.repository.SearchRepositoryEntryParameters;
 import org.olat.repository.manager.RepositoryEntryRelationDAO;
 import org.olat.repository.model.RepositoryEntryToGroupRelation;
+import org.olat.repository.model.SearchRepositoryEntryParameters;
 import org.olat.resource.OLATResource;
 import org.olat.resource.accesscontrol.ACService;
 import org.olat.resource.accesscontrol.manager.ACReservationDAO;
diff --git a/src/main/java/org/olat/group/ui/edit/BusinessGroupEditResourceController.java b/src/main/java/org/olat/group/ui/edit/BusinessGroupEditResourceController.java
index ac8b8fe76e438f85a72c394847363a175e2d70f1..0c13c46a3c7661708611f97862a30d942fd6146d 100644
--- a/src/main/java/org/olat/group/ui/edit/BusinessGroupEditResourceController.java
+++ b/src/main/java/org/olat/group/ui/edit/BusinessGroupEditResourceController.java
@@ -56,10 +56,10 @@ import org.olat.group.BusinessGroupManagedFlag;
 import org.olat.group.BusinessGroupService;
 import org.olat.repository.RepositoryEntry;
 import org.olat.repository.RepositoryEntryManagedFlag;
-import org.olat.repository.RepositoryTableModel;
 import org.olat.repository.controllers.ReferencableEntriesSearchController;
 import org.olat.repository.controllers.RepositoryEntryFilter;
 import org.olat.repository.controllers.RepositorySearchController.Can;
+import org.olat.repository.ui.RepositoryTableModel;
 
 /**
  * Description:<BR>
diff --git a/src/main/java/org/olat/group/ui/edit/RemoveResourceActionColumnDescriptor.java b/src/main/java/org/olat/group/ui/edit/RemoveResourceActionColumnDescriptor.java
index eaf2850129ab133136792c4eb6f5a8e2f78d1997..41a4a223c5e8d4e997d0ab1bcee8265b43f60268 100644
--- a/src/main/java/org/olat/group/ui/edit/RemoveResourceActionColumnDescriptor.java
+++ b/src/main/java/org/olat/group/ui/edit/RemoveResourceActionColumnDescriptor.java
@@ -25,7 +25,7 @@ import org.olat.core.gui.render.StringOutput;
 import org.olat.core.gui.translator.Translator;
 import org.olat.repository.RepositoryEntry;
 import org.olat.repository.RepositoryEntryManagedFlag;
-import org.olat.repository.RepositoryTableModel;
+import org.olat.repository.ui.RepositoryTableModel;
 
 /**
  * The remove link appear only if the repository is not managed (flag groups)
diff --git a/src/main/java/org/olat/group/ui/main/AbstractMemberListController.java b/src/main/java/org/olat/group/ui/main/AbstractMemberListController.java
index e6d0c72983f0b606aa59c9932c45afe4f3d20906..4fb8821482c3bb408b90c508e92718e8a8738e3e 100644
--- a/src/main/java/org/olat/group/ui/main/AbstractMemberListController.java
+++ b/src/main/java/org/olat/group/ui/main/AbstractMemberListController.java
@@ -57,6 +57,7 @@ import org.olat.core.gui.control.generic.closablewrapper.CloseableModalControlle
 import org.olat.core.gui.control.generic.dtabs.Activateable2;
 import org.olat.core.gui.control.generic.modal.DialogBoxController;
 import org.olat.core.gui.control.generic.modal.DialogBoxUIFactory;
+import org.olat.core.gui.translator.Translator;
 import org.olat.core.id.Identity;
 import org.olat.core.id.Roles;
 import org.olat.core.id.context.ContextEntry;
@@ -144,17 +145,17 @@ public abstract class AbstractMemberListController extends BasicController imple
 	
 	public AbstractMemberListController(UserRequest ureq, WindowControl wControl, RepositoryEntry repoEntry,
 			String page) {
-		this(ureq, wControl, repoEntry, null, page);
+		this(ureq, wControl, repoEntry, null, page, null);
 	}
 	
 	public AbstractMemberListController(UserRequest ureq, WindowControl wControl, BusinessGroup group,
 			String page) {
-		this(ureq, wControl, null, group, page);
+		this(ureq, wControl, null, group, page, null);
 	}
 	
-	private AbstractMemberListController(UserRequest ureq, WindowControl wControl, RepositoryEntry repoEntry, BusinessGroup group,
-			String page) {
-		super(ureq, wControl, Util.createPackageTranslator(UserPropertyHandler.class, ureq.getLocale()));
+	protected AbstractMemberListController(UserRequest ureq, WindowControl wControl, RepositoryEntry repoEntry, BusinessGroup group,
+			String page, Translator translator) {
+		super(ureq, wControl, Util.createPackageTranslator(UserPropertyHandler.class, ureq.getLocale(), translator));
 		
 		this.businessGroup = group;
 		this.repoEntry = repoEntry;
diff --git a/src/main/java/org/olat/group/ui/run/BusinessGroupMainRunController.java b/src/main/java/org/olat/group/ui/run/BusinessGroupMainRunController.java
index 2c7b8bfdb0a701bbec5bbdd1d5fef2b55725ea5a..5715a98c2418006105969ce0b3e0815e6979cf81 100644
--- a/src/main/java/org/olat/group/ui/run/BusinessGroupMainRunController.java
+++ b/src/main/java/org/olat/group/ui/run/BusinessGroupMainRunController.java
@@ -94,7 +94,7 @@ import org.olat.modules.openmeetings.OpenMeetingsModule;
 import org.olat.modules.wiki.WikiManager;
 import org.olat.portfolio.PortfolioModule;
 import org.olat.repository.RepositoryEntry;
-import org.olat.repository.RepositoryTableModel;
+import org.olat.repository.ui.RepositoryTableModel;
 import org.olat.resource.OLATResource;
 import org.olat.resource.accesscontrol.ACService;
 import org.olat.resource.accesscontrol.ACUIFactory;
diff --git a/src/main/java/org/olat/group/ui/wizard/BGConfigResourcesStepController.java b/src/main/java/org/olat/group/ui/wizard/BGConfigResourcesStepController.java
index 38ae16a3f89f893aee334873899894b9865b0ab5..b28273890ceeac89a2c644d6ea375e88ab6060c5 100644
--- a/src/main/java/org/olat/group/ui/wizard/BGConfigResourcesStepController.java
+++ b/src/main/java/org/olat/group/ui/wizard/BGConfigResourcesStepController.java
@@ -46,8 +46,8 @@ import org.olat.core.util.Util;
 import org.olat.course.CourseModule;
 import org.olat.group.ui.edit.BusinessGroupEditResourceController;
 import org.olat.repository.RepositoryEntry;
-import org.olat.repository.RepositoryTableModel;
 import org.olat.repository.controllers.ReferencableEntriesSearchController;
+import org.olat.repository.ui.RepositoryTableModel;
 
 /**
  * 
diff --git a/src/main/java/org/olat/modules/qpool/ui/AbstractItemListController.java b/src/main/java/org/olat/modules/qpool/ui/AbstractItemListController.java
index 7f5d1e5ab29a2fa67f4d75b0c2f8a6ee9a905319..9ad21354344840368956c57b8bc1ac1cda429e08 100644
--- a/src/main/java/org/olat/modules/qpool/ui/AbstractItemListController.java
+++ b/src/main/java/org/olat/modules/qpool/ui/AbstractItemListController.java
@@ -137,7 +137,7 @@ public abstract class AbstractItemListController extends FormBasicController
 		columnsModel.addFlexiColumnModel(new StaticFlexiColumnModel("details", translate("details"), "select-item"));
 		
 		model = new QuestionItemDataModel(columnsModel, this, getTranslator());
-		itemsTable = uifactory.addTableElement(ureq, getWindowControl(), "items", model, 50, getTranslator(), formLayout);
+		itemsTable = uifactory.addTableElement(ureq, getWindowControl(), "items", model, 50, true, getTranslator(), formLayout);
 		itemsTable.setWrapperSelector("#qitems");
 		itemsTable.setSelectAllEnable(true);
 		itemsTable.setMultiSelect(true);
diff --git a/src/main/java/org/olat/modules/wiki/restapi/WikisWebService.java b/src/main/java/org/olat/modules/wiki/restapi/WikisWebService.java
index a0c0e75b931b8f12d35249ec6665e4a926e45f8b..148b5ba756e96efac8348c7594219c18c6539b48 100644
--- a/src/main/java/org/olat/modules/wiki/restapi/WikisWebService.java
+++ b/src/main/java/org/olat/modules/wiki/restapi/WikisWebService.java
@@ -41,7 +41,7 @@ import org.olat.modules.wiki.restapi.vo.WikiVO;
 import org.olat.modules.wiki.restapi.vo.WikiVOes;
 import org.olat.repository.RepositoryEntry;
 import org.olat.repository.RepositoryManager;
-import org.olat.repository.SearchRepositoryEntryParameters;
+import org.olat.repository.model.SearchRepositoryEntryParameters;
 
 /**
  * 
diff --git a/src/main/java/org/olat/repository/DetailsReadOnlyForm.java b/src/main/java/org/olat/repository/DetailsReadOnlyForm.java
deleted file mode 100644
index b1f561fbaaeafeb29a5f1c49729486309a9a3268..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/repository/DetailsReadOnlyForm.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/**
-* OLAT - Online Learning and Training<br>
-* http://www.olat.org
-* <p>
-* Licensed under the Apache License, Version 2.0 (the "License"); <br>
-* you may not use this file except in compliance with the License.<br>
-* You may obtain a copy of the License at
-* <p>
-* http://www.apache.org/licenses/LICENSE-2.0
-* <p>
-* Unless required by applicable law or agreed to in writing,<br>
-* software distributed under the License is distributed on an "AS IS" BASIS, <br>
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
-* See the License for the specific language governing permissions and <br>
-* limitations under the License.
-* <p>
-* Copyright (c) since 2004 at Multimedia- & E-Learning Services (MELS),<br>
-* University of Zurich, Switzerland.
-* <hr>
-* <a href="http://www.openolat.org">
-* OpenOLAT - Online Learning and Training</a><br>
-* This file has been modified by the OpenOLAT community. Changes are licensed
-* under the Apache 2.0 license as the original file.
-*/
-
-package org.olat.repository;
-
-import org.olat.NewControllerFactory;
-import org.olat.core.gui.UserRequest;
-import org.olat.core.gui.components.form.flexible.FormItemContainer;
-import org.olat.core.gui.components.form.flexible.elements.SelectionElement;
-import org.olat.core.gui.components.form.flexible.impl.FormBasicController;
-import org.olat.core.gui.control.Controller;
-import org.olat.core.gui.control.WindowControl;
-import org.olat.repository.handlers.RepositoryHandler;
-import org.olat.repository.handlers.RepositoryHandlerFactory;
-
-/**
- * Initial Date:  08.07.2003
- *
- * @author Mike Stock
- * 
- * Comment:  
- * 
- */
-public class DetailsReadOnlyForm extends FormBasicController {
-
-	private RepositoryEntry entry;
-	private String typeName;
-	
-	final public static int MAX_DISPLAYNAME = 100;
-	private SelectionElement canDownload;
-	
-	/**
-	 * The details form is initialized with data collected from entry and typeName. Handler is looked-up by
-	 * the given handlerName and not by the entry's resourceableType. This is to allow for an entry with no resourceable
-	 * to initialize correctly (c.f. RepositoryAdd workflow). The typeName may be null.
-	 * 
-	 * @param name
-	 * @param t
-	 * @param entry
-	 * @param typeName
-	 * @param enableAuthorView
-	 */
-	public DetailsReadOnlyForm(UserRequest ureq, WindowControl wControl, RepositoryEntry entry, String typeName) {
-		super(ureq, wControl);
-		this.entry = entry;
-		this.typeName = typeName;
-		initForm (ureq);
-	}
-	
-	@Override
-	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
-		uifactory.addStaticTextElement("cif_displayname", "cif.displayname", entry.getDisplayname(), formLayout);
-		uifactory.addStaticTextElement("cif_initialAuthor", "cif.initialAuthor", entry.getInitialAuthor(), formLayout);
-		uifactory.addStaticTextElement("cif_description", "cif.description", (entry.getDescription() != null) ? entry.getDescription() : " ", formLayout);
-		uifactory.addStaticTextElement("cif_resourcename", "cif.resourcename", (entry.getResourcename() == null) ? "-" : entry.getResourcename(), formLayout);
-	
-		StringBuilder typeDisplayText = new StringBuilder(100);
-		if (typeName != null) { // add image and typename code
-			typeDisplayText.append("<span class=\"b_with_small_icon_left ");
-			typeDisplayText.append(RepositoyUIFactory.getIconCssClass(entry));
-			typeDisplayText.append("\">");
-			String tName = NewControllerFactory.translateResourceableTypeName(typeName, getLocale());
-			typeDisplayText.append(tName);
-			typeDisplayText.append("</span>"); 
-		} else {
-			typeDisplayText.append(translate("cif.type.na"));
-		}
-		
-		uifactory.addStaticTextElement("cif_type", "cif.type", typeDisplayText.toString(), formLayout);
-		
-		RepositoryHandler handler = null;
-		if (typeName != null) handler = RepositoryHandlerFactory.getInstance().getRepositoryHandler(typeName);
-		
-		canDownload = uifactory.addCheckboxesVertical("cif_canDownload", "cif.canDownload", formLayout, new String[]{"xx"}, new String[]{null}, null, 1);
-		canDownload.select("xx", entry.getCanDownload());
-		canDownload.setVisible(handler != null && handler.supportsDownload(this.entry));
-		canDownload.setEnabled(false); // It is readonly
-		if (handler == null || !handler.supportsDownload(this.entry)) {
-			canDownload.setExampleKey("cif.canDownload.na", null);
-		}
-	}
-
-	@Override
-	protected void formOK(UserRequest ureq) {
-		//
-	}
-
-	@Override
-	protected void doDispose() {
-		//
-	}
-}
\ No newline at end of file
diff --git a/src/main/java/org/olat/repository/DisplayCourseInfoForm.java b/src/main/java/org/olat/repository/DisplayCourseInfoForm.java
deleted file mode 100644
index 5a32a8b39e51d91121e810856b0331243320da9a..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/repository/DisplayCourseInfoForm.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/**
-* OLAT - Online Learning and Training<br>
-* http://www.olat.org
-* <p>
-* Licensed under the Apache License, Version 2.0 (the "License"); <br>
-* you may not use this file except in compliance with the License.<br>
-* You may obtain a copy of the License at
-* <p>
-* http://www.apache.org/licenses/LICENSE-2.0
-* <p>
-* Unless required by applicable law or agreed to in writing,<br>
-* software distributed under the License is distributed on an "AS IS" BASIS, <br>
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
-* See the License for the specific language governing permissions and <br>
-* limitations under the License.
-* <p>
-* Copyright (c) since 2004 at Multimedia- & E-Learning Services (MELS),<br>
-* University of Zurich, Switzerland.
-* <hr>
-* <a href="http://www.openolat.org">
-* OpenOLAT - Online Learning and Training</a><br>
-* This file has been modified by the OpenOLAT community. Changes are licensed
-* under the Apache 2.0 license as the original file.
-*/
-
-package org.olat.repository;
-
-import org.olat.core.CoreSpringFactory;
-import org.olat.core.gui.UserRequest;
-import org.olat.core.gui.components.form.flexible.FormItemContainer;
-import org.olat.core.gui.components.form.flexible.elements.SelectionElement;
-import org.olat.core.gui.components.form.flexible.impl.FormBasicController;
-import org.olat.core.gui.control.Controller;
-import org.olat.core.gui.control.WindowControl;
-import org.olat.course.CourseModule;
-import org.olat.course.ICourse;
-import org.olat.course.config.CourseConfig;
-import org.olat.instantMessaging.InstantMessagingModule;
-
-
-/**
- *
- */
-public class DisplayCourseInfoForm extends FormBasicController {
-
-	private SelectionElement chatIsOn;
-	private SelectionElement efficencyStatement;
-	private SelectionElement calendar;
-
-	private CourseConfig cc;
-	
-	
-	public DisplayCourseInfoForm(UserRequest ureq, WindowControl wControl, ICourse course) {
-		super(ureq, wControl);
-		cc = course.getCourseEnvironment().getCourseConfig();
-		initForm (ureq);
-	}
-
-	@Override
-	protected void formOK(UserRequest ureq) {
-		//
-	}
-
-	@Override
-	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
-		setFormTitle("details.summaryprop");
-		setFormContextHelp("org.olat.repository","rep-meta-infoCourse.html","help.hover.rep.detail");
-		
-		chatIsOn = uifactory.addCheckboxesVertical("chatIsOn", "chkbx.chat.onoff", formLayout, new String[]{"xx"}, new String[]{null}, null, 1);
-		chatIsOn.select("xx", cc.isChatEnabled());
-		chatIsOn.setVisible(CoreSpringFactory.getImpl(InstantMessagingModule.class).isEnabled() && CourseModule.isCourseChatEnabled());
-		
-		uifactory.addStaticTextElement(
-				"layout", "form.layout.cssfile",
-				cc.hasCustomCourseCSS() ? cc.getCssLayoutRef() : translate("form.layout.setsystemcss"),
-				formLayout
-		);
-		
-		String name;
-		String softkey = cc.getSharedFolderSoftkey();
-		RepositoryEntry re = RepositoryManager.getInstance().lookupRepositoryEntryBySoftkey(softkey, false);
-		if (re == null) {
-			cc.setSharedFolderSoftkey(CourseConfig.VALUE_EMPTY_SHAREDFOLDER_SOFTKEY);
-			name = translate("sf.notconfigured");
-		} else {
-			name = re.getDisplayname();
-		}
-		
-		uifactory.addStaticTextElement(
-				"sfolder", "sf.resourcetitle",
-				cc.hasCustomSharedFolder() ? name : translate("sf.notconfigured"),
-				formLayout
-		);
-		
-		efficencyStatement = uifactory.addCheckboxesVertical("efficencyStatement", "chkbx.efficency.onoff", formLayout, new String[]{"xx"}, new String[]{null}, null, 1);
-		efficencyStatement.select("xx", cc.isEfficencyStatementEnabled());
-
-		calendar = uifactory.addCheckboxesVertical("calendar", "chkbx.calendar.onoff", formLayout, new String[]{"xx"}, new String[]{null}, null, 1);
-		calendar.select("xx", cc.isCalendarEnabled());
-		
-		String glossName;
-		String glossSoftKey = cc.getGlossarySoftKey();
-		re = RepositoryManager.getInstance().lookupRepositoryEntryBySoftkey(glossSoftKey, false);
-		if (re == null) {
-			glossName = translate("glossary.no.glossary");
-		} else {
-			glossName = re.getDisplayname();
-		}
-		
-		uifactory.addStaticTextElement(
-				"glossary", "glossary.isconfigured",
-				cc.hasGlossary() ? glossName : translate("glossary.no.glossary"),
-				formLayout
-		);
-		
-		flc.setEnabled(false);
-	}
-
-	@Override
-	protected void doDispose() {
-		//
-	}
-}
diff --git a/src/main/java/org/olat/repository/DisplayInfoForm.java b/src/main/java/org/olat/repository/DisplayInfoForm.java
deleted file mode 100644
index 3c4acc107fc1c2c062ec291a49192016d2204179..0000000000000000000000000000000000000000
--- a/src/main/java/org/olat/repository/DisplayInfoForm.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/**
-* OLAT - Online Learning and Training<br>
-* http://www.olat.org
-* <p>
-* Licensed under the Apache License, Version 2.0 (the "License"); <br>
-* you may not use this file except in compliance with the License.<br>
-* You may obtain a copy of the License at
-* <p>
-* http://www.apache.org/licenses/LICENSE-2.0
-* <p>
-* Unless required by applicable law or agreed to in writing,<br>
-* software distributed under the License is distributed on an "AS IS" BASIS, <br>
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
-* See the License for the specific language governing permissions and <br>
-* limitations under the License.
-* <p>
-* Copyright (c) since 2004 at Multimedia- & E-Learning Services (MELS),<br>
-* University of Zurich, Switzerland.
-* <hr>
-* <a href="http://www.openolat.org">
-* OpenOLAT - Online Learning and Training</a><br>
-* This file has been modified by the OpenOLAT community. Changes are licensed
-* under the Apache 2.0 license as the original file.
-*/
-
-package org.olat.repository;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.olat.core.gui.UserRequest;
-import org.olat.core.gui.components.form.flexible.FormItemContainer;
-import org.olat.core.gui.components.form.flexible.elements.SelectionElement;
-import org.olat.core.gui.components.form.flexible.impl.FormBasicController;
-import org.olat.core.gui.control.Controller;
-import org.olat.core.gui.control.WindowControl;
-import org.olat.login.LoginModule;
-import org.olat.repository.handlers.RepositoryHandler;
-import org.olat.repository.handlers.RepositoryHandlerFactory;
-
-
-/**
- * @author Ingmar Kroll
- * 
- * Comment:  
- * 
- */
-public class DisplayInfoForm extends FormBasicController {
-
-	private SelectionElement canCopy;
-	private SelectionElement canReference;
-	private SelectionElement canDownload;
-	private SelectionElement access;
-	
-	private RepositoryEntry entry;
-	private RepositoryHandler handler;
-	
-	public DisplayInfoForm(UserRequest ureq, WindowControl wControl, RepositoryEntry entry) {
-		super(ureq, wControl);
-		this.entry = entry;
-		handler = RepositoryHandlerFactory.getInstance().getRepositoryHandler(entry);
-		initForm (ureq);
-	}
-
-	@Override
-	protected void formOK(UserRequest ureq) {
-		//
-	}
-
-	@Override
-	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
-		setFormTitle("tab.public");
-		setFormContextHelp("org.olat.repository","rep-meta-olatauthor.html","help.hover.rep.detail");
-		
-		canCopy = uifactory.addCheckboxesVertical("cif_canCopy", "cif.canCopy", formLayout, new String[]{"xx"}, new String[]{null}, null, 1);
-		canCopy.select("xx", entry.getCanCopy());
-		
-		canReference = uifactory.addCheckboxesVertical("cif_canReference", "cif.canReference", formLayout, new String[]{"xx"}, new String[]{null}, null, 1);
-		canReference.select("xx", entry.getCanReference());
-		
-		canDownload = uifactory.addCheckboxesVertical("cif_canDownload", "cif.canDownload", formLayout, new String[]{"xx"}, new String[]{null}, null, 1);
-		canDownload.select("xx", entry.getCanDownload());
-		canDownload.setVisible(handler != null && handler.supportsDownload(this.entry));
-		
-		List<String> keyList = new ArrayList<String>();
-		keyList.add(Integer.toString(RepositoryEntry.ACC_OWNERS));
-		keyList.add(Integer.toString(RepositoryEntry.ACC_OWNERS_AUTHORS));
-		keyList.add(Integer.toString(RepositoryEntry.ACC_USERS));
-		if(LoginModule.isGuestLoginLinksEnabled()) {
-			keyList.add(Integer.toString(RepositoryEntry.ACC_USERS_GUESTS));
-		}
-		keyList.add(RepositoryEntry.MEMBERS_ONLY);
-		String[] keys = keyList.toArray(new String[keyList.size()]);
-
-		List<String> valueList = new ArrayList<String>();
-		valueList.add(translate("cif.access.owners"));
-		valueList.add(translate("cif.access.owners_authors"));
-		valueList.add(translate("cif.access.users"));
-		if(LoginModule.isGuestLoginLinksEnabled()) {
-			valueList.add(translate("cif.access.users_guests"));
-		}
-		valueList.add(translate("cif.access.membersonly"));
-		String[] values = valueList.toArray(new String[valueList.size()]);
-		
-		access = uifactory.addRadiosVertical("cif_access", "cif.access", formLayout, keys, values);
-		//fxdiff VCRP-1,2: access control of resources
-		if(entry.isMembersOnly()) {
-			access.select(RepositoryEntry.MEMBERS_ONLY, true);
-		} else if (entry.getAccess() > 0) {
-			if(!LoginModule.isGuestLoginLinksEnabled() && entry.getAccess() == RepositoryEntry.ACC_USERS_GUESTS) {
-				access.select(Integer.toString(RepositoryEntry.ACC_USERS), true);
-			} else {
-				access.select(Integer.toString(entry.getAccess()), true);
-			}
-		}
-
-		flc.setEnabled(false);
-	}
-
-	@Override
-	protected void doDispose() {
-		//
-	}
-}
\ No newline at end of file
diff --git a/src/main/java/org/olat/repository/RepositoryManager.java b/src/main/java/org/olat/repository/RepositoryManager.java
index 2f532e49f96c8b5aed58252bb29c36a90901a1ff..11d22005b96746e7857e97dec8ab14650f11a029 100644
--- a/src/main/java/org/olat/repository/RepositoryManager.java
+++ b/src/main/java/org/olat/repository/RepositoryManager.java
@@ -85,6 +85,7 @@ import org.olat.repository.model.RepositoryEntryLifecycle;
 import org.olat.repository.model.RepositoryEntryMembership;
 import org.olat.repository.model.RepositoryEntryPermissionChangeEvent;
 import org.olat.repository.model.RepositoryEntryShortImpl;
+import org.olat.repository.model.SearchRepositoryEntryParameters;
 import org.olat.resource.OLATResource;
 import org.olat.resource.OLATResourceManager;
 import org.olat.resource.accesscontrol.manager.ACReservationDAO;
diff --git a/src/main/java/org/olat/repository/RepositoryModule.java b/src/main/java/org/olat/repository/RepositoryModule.java
index 73ea0d0aa609a5c52fedc87ca51ac2f15c813fea..4f5a0f917b92703df3a56478e5d457220ed33a1d 100644
--- a/src/main/java/org/olat/repository/RepositoryModule.java
+++ b/src/main/java/org/olat/repository/RepositoryModule.java
@@ -28,6 +28,7 @@ import org.olat.core.id.context.SiteContextEntryControllerCreator;
 import org.olat.core.util.StringHelper;
 import org.olat.course.site.CourseSiteContextEntryControllerCreator;
 import org.olat.group.BusinessGroupModule;
+import org.olat.repository.site.MyCoursesSite;
 import org.olat.repository.site.RepositorySite;
 
 /**
@@ -72,6 +73,9 @@ public class RepositoryModule extends AbstractOLATModule {
 		NewControllerFactory.getInstance().addContextEntryControllerCreator(RepositorySite.class.getSimpleName(),
 				new SiteContextEntryControllerCreator(RepositorySite.class));
 		
+		NewControllerFactory.getInstance().addContextEntryControllerCreator(MyCoursesSite.class.getSimpleName(),
+				new SiteContextEntryControllerCreator(MyCoursesSite.class));
+		
 		updateProperties();
 	}
 
diff --git a/src/main/java/org/olat/repository/RepositoryService.java b/src/main/java/org/olat/repository/RepositoryService.java
index 75f52c1a98133ac8cb40061d31e6c12497d0285c..2cd5127ce50d30758c0545a16d0c2a035ce3ff90 100644
--- a/src/main/java/org/olat/repository/RepositoryService.java
+++ b/src/main/java/org/olat/repository/RepositoryService.java
@@ -25,6 +25,8 @@ import org.olat.basesecurity.Group;
 import org.olat.basesecurity.IdentityRef;
 import org.olat.core.id.Identity;
 import org.olat.core.util.vfs.VFSLeaf;
+import org.olat.repository.model.SearchAuthorRepositoryEntryViewParams;
+import org.olat.repository.model.SearchMyRepositoryEntryViewParams;
 import org.olat.resource.OLATResource;
 
 
diff --git a/src/main/java/org/olat/repository/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/repository/_i18n/LocalStrings_de.properties
index 81f1ea23ed5b49a6d322ee86345a003896d11896..202eb6880d6730036ceb800ce66ce10d900cb498 100644
--- a/src/main/java/org/olat/repository/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/repository/_i18n/LocalStrings_de.properties
@@ -55,6 +55,37 @@ add.wiki.intro=Wiki-Lerninhalt hinzuf\u00FCgen (ZIP-Datei, die beim Download aus
 add.wrongtype=Das Format dieser Lernressource entspricht nicht dem gew\u00E4hlten Format.\nDie Lernressource wurde nicht hinzugef\u00FCgt.
 addinfo.owner=Zusatzinformationen
 allcourses=Alle meine Kurse
+add.member=$org.olat.group.ui.main\:add.member
+edit.member=$org.olat.group.ui.main\:edit.member
+edit.member.groups=$org.olat.group.ui.main\:edit.member.groups
+error.atleastone=$org.olat.course.member\:error.atleastone
+error.msg.send.no.rcps=$org.olat.modules.co\:error.msg.send.no.rcps
+import.member=$org.olat.group.ui.main\:import.member
+home=$org.olat.group.ui.main\:home
+assessment=$org.olat.group.ui.main\:assessment
+table.header.online=$org.olat.group.ui.main\:table.header.online
+table.header.edit=$org.olat.group.ui.main\:table.header.edit
+table.header.remove=$org.olat.group.ui.main\:table.header.remove
+table.header.graduate=$org.olat.group.ui.main\:table.header.graduate
+table.header.firstName=$org.olat.group.ui.main\:table.header.firstName
+table.header.lastName=$org.olat.group.ui.main\:table.header.lastName
+table.header.mail=$org.olat.group.ui.main\:table.header.mail
+table.header.login=$org.olat.group.ui.main\:table.header.login
+table.header.firstTime=$org.olat.group.ui.main\:table.header.firstTime
+table.header.lastTime=$org.olat.group.ui.main\:table.header.lastTime
+table.header.role=$org.olat.group.ui.main\:table.header.role
+table.header.groups=$org.olat.group.ui.main\:table.header.groups
+table.header.tutorsCount=$org.olat.group.ui.main\:table.header.tutorsCount
+table.header.participantsCount=$org.olat.group.ui.main\:table.header.participantsCount
+table.header.freePlace=$org.olat.group.ui.main\:table.header.freePlace
+table.header.tutors=$org.olat.group.ui.main\:table.header.tutors
+table.header.participants=$org.olat.group.ui.main\:table.header.participants
+table.header.waitingList=$org.olat.group.ui.main\:table.header.waitingList
+dialog.modal.bg.send.mail=$org.olat.group.ui.main\:dialog.modal.bg.send.mail
+dialog.modal.bg.leave.text=$org.olat.group.ui.main\:dialog.modal.bg.leave.text
+nomembers=XXX No members
+mail.member=$org.olat.group.ui.main\:mail.member
+user.notfound=Folgende Benutzer wurden nicht gefunden: {0}
 cap.launch=Die Lernressource wird geladen. Bitte warten...
 catalog.path=Pfad
 chelp.anim=<i>$org.olat.repository\:FileResource.ANIM</i>
diff --git a/src/main/java/org/olat/repository/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/repository/_i18n/LocalStrings_en.properties
index 1be68d2a793c74903f872df892ef56561d377120..e059de6cb44ce49c4397221a679ac1f13c9f60da 100644
--- a/src/main/java/org/olat/repository/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/repository/_i18n/LocalStrings_en.properties
@@ -56,6 +56,37 @@ admin.lifecycles.intro=Create and edit semester terms to define semester course
 admin.lifecycles.title=Management of semester terms for courses
 admin.menu.lifecycle.title=Semester terms
 allcourses=All courses
+add.member=$org.olat.group.ui.main\:add.member
+assessment=$org.olat.group.ui.main\:assessment
+dialog.modal.bg.leave.text=$org.olat.group.ui.main\:dialog.modal.bg.leave.text
+dialog.modal.bg.send.mail=$org.olat.group.ui.main\:dialog.modal.bg.send.mail
+edit.member=$org.olat.group.ui.main\:edit.member
+edit.member.groups=$org.olat.group.ui.main\:edit.member.groups
+error.atleastone=$org.olat.course.member\:error.atleastone
+error.msg.send.no.rcps=$org.olat.modules.co\:error.msg.send.no.rcps
+home=$org.olat.group.ui.main\:home
+import.member=$org.olat.group.ui.main\:import.member
+nomembers=XXX No members
+mail.member=$org.olat.group.ui.main\:mail.member
+table.header.online=$org.olat.group.ui.main\:table.header.online
+table.header.edit=$org.olat.group.ui.main\:table.header.edit
+table.header.firstName=$org.olat.group.ui.main\:table.header.firstName
+table.header.firstTime=$org.olat.group.ui.main\:table.header.firstTime
+table.header.freePlace=$org.olat.group.ui.main\:table.header.freePlace
+table.header.graduate=$org.olat.group.ui.main\:table.header.graduate
+table.header.groups=$org.olat.group.ui.main\:table.header.groups
+table.header.lastName=$org.olat.group.ui.main\:table.header.lastName
+table.header.lastTime=$org.olat.group.ui.main\:table.header.lastTime
+table.header.login=$org.olat.group.ui.main\:table.header.login
+table.header.mail=$org.olat.group.ui.main\:table.header.mail
+table.header.participants=$org.olat.group.ui.main\:table.header.participants
+table.header.participantsCount=$org.olat.group.ui.main\:table.header.participantsCount
+table.header.remove=$org.olat.group.ui.main\:table.header.remove
+table.header.role=$org.olat.group.ui.main\:table.header.role
+table.header.tutors=$org.olat.group.ui.main\:table.header.tutors
+table.header.tutorsCount=$org.olat.group.ui.main\:table.header.tutorsCount
+table.header.waitingList=$org.olat.group.ui.main\:table.header.waitingList
+user.notfound=The following users have not been found: {0}
 cap.launch=Loading learning resource. Please wait...
 chelp.anim=<i>$org.olat.repository\:FileResource.ANIM</i>
 chelp.assOwn=<i>$org.olat.repository\:details.groups</i>
diff --git a/src/main/java/org/olat/repository/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/repository/_i18n/LocalStrings_fr.properties
index 2540199d28e63566f6bd14b21c22d1e88823d8ae..fed520674c4bf43bda1b2c4970ea9bb539f9378a 100644
--- a/src/main/java/org/olat/repository/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/repository/_i18n/LocalStrings_fr.properties
@@ -53,6 +53,37 @@ addinfo.owner=Informations suppl\u00E9mentaires
 admin.lifecycles.intro=Cr\u00E9er et \u00E9diter des donn\u00E9es semestrielles pour d\u00E9finir les p\u00E9riodes d'ex\u00E9cution du cours pendant un semestre au lieu de d\u00E9finir une p\u00E9riode individuelle pour chaque cours. Les semestres que vous avez cr\u00E9\u00E9es ici peuvent \u00EAtre utilis\u00E9s lors de la configuration de la p\u00E9riode d'ex\u00E9cution du cours. Comme identifiant, vous pouvez utiliser une d\u00E9signation comme "SS15" et comme nom "le semestre d'\u00E9t\u00E9 2015"
 admin.lifecycles.title=Gestion des donn\u00E9es semestrielles pour les cours
 admin.menu.lifecycle.title=Donn\u00E9es semestrielles
+add.member=$org.olat.group.ui.main\:add.member
+assessment=$org.olat.group.ui.main\:assessment
+dialog.modal.bg.leave.text=$org.olat.group.ui.main\:dialog.modal.bg.leave.text
+dialog.modal.bg.send.mail=$org.olat.group.ui.main\:dialog.modal.bg.send.mail
+edit.member=$org.olat.group.ui.main\:edit.member
+edit.member.groups=$org.olat.group.ui.main\:edit.member.groups
+error.atleastone=$org.olat.course.member\:error.atleastone
+error.msg.send.no.rcps=$org.olat.modules.co\:error.msg.send.no.rcps
+home=$org.olat.group.ui.main\:home
+import.member=$org.olat.group.ui.main\:import.member
+mail.member=$org.olat.group.ui.main\:mail.member
+nomembers=Pas de membres
+table.header.edit=$org.olat.group.ui.main\:table.header.edit
+table.header.firstName=$org.olat.group.ui.main\:table.header.firstName
+table.header.firstTime=$org.olat.group.ui.main\:table.header.firstTime
+table.header.freePlace=$org.olat.group.ui.main\:table.header.freePlace
+table.header.graduate=$org.olat.group.ui.main\:table.header.graduate
+table.header.groups=$org.olat.group.ui.main\:table.header.groups
+table.header.lastName=$org.olat.group.ui.main\:table.header.lastName
+table.header.lastTime=$org.olat.group.ui.main\:table.header.lastTime
+table.header.login=$org.olat.group.ui.main\:table.header.login
+table.header.mail=$org.olat.group.ui.main\:table.header.mail
+table.header.online=$org.olat.group.ui.main\:table.header.online
+table.header.participants=$org.olat.group.ui.main\:table.header.participants
+table.header.participantsCount=$org.olat.group.ui.main\:table.header.participantsCount
+table.header.remove=$org.olat.group.ui.main\:table.header.remove
+table.header.role=$org.olat.group.ui.main\:table.header.role
+table.header.tutors=$org.olat.group.ui.main\:table.header.tutors
+table.header.tutorsCount=$org.olat.group.ui.main\:table.header.tutorsCount
+table.header.waitingList=$org.olat.group.ui.main\:table.header.waitingList
+user.notfound=Les utilisateurs suivants n'ont pas \u00E9t\u00E9 trouv\u00E9\: {0}
 allcourses=Tous mes cours
 cap.launch=La ressource didactique est charg\u00E9e. Veuillez patienter svp...
 chelp.anim=<i>$org.olat.repository\:FileResource.ANIM</i>
diff --git a/src/main/java/org/olat/repository/_i18n/LocalStrings_pl.properties b/src/main/java/org/olat/repository/_i18n/LocalStrings_pl.properties
index 6a4ad2e7f1534e6407ed8b584387831f203facbd..6ff043c52452460d9aa84fd9cb164956c908a8ba 100644
--- a/src/main/java/org/olat/repository/_i18n/LocalStrings_pl.properties
+++ b/src/main/java/org/olat/repository/_i18n/LocalStrings_pl.properties
@@ -49,6 +49,37 @@ add.wiki=Dodaj Wiki
 add.wiki.intro=Dodaj Wiki (plik ZIP wygenerowany przez system OpenOLAT).
 add.wrongtype=Format tego zasobu edukacyjnego nie odpowiada wybranemu formatowi. Nie dodano zasobu.
 addinfo.owner=Dodatkowe informacje
+add.member=$org.olat.group.ui.main\:add.member
+assessment=$org.olat.group.ui.main\:assessment
+dialog.modal.bg.leave.text=$org.olat.group.ui.main\:dialog.modal.bg.leave.text
+dialog.modal.bg.send.mail=$org.olat.group.ui.main\:dialog.modal.bg.send.mail
+edit.member=$org.olat.group.ui.main\:edit.member
+edit.member.groups=$org.olat.group.ui.main\:edit.member.groups
+error.atleastone=$org.olat.course.member\:error.atleastone
+error.msg.send.no.rcps=$org.olat.modules.co\:error.msg.send.no.rcps
+home=$org.olat.group.ui.main\:home
+import.member=$org.olat.group.ui.main\:import.member
+mail.member=$org.olat.group.ui.main\:mail.member
+nomembers=XXX No members
+table.header.edit=$org.olat.group.ui.main\:table.header.edit
+table.header.firstName=$org.olat.group.ui.main\:table.header.firstName
+table.header.firstTime=$org.olat.group.ui.main\:table.header.firstTime
+table.header.freePlace=$org.olat.group.ui.main\:table.header.freePlace
+table.header.graduate=$org.olat.group.ui.main\:table.header.graduate
+table.header.groups=$org.olat.group.ui.main\:table.header.groups
+table.header.lastName=$org.olat.group.ui.main\:table.header.lastName
+table.header.lastTime=$org.olat.group.ui.main\:table.header.lastTime
+table.header.login=$org.olat.group.ui.main\:table.header.login
+table.header.mail=$org.olat.group.ui.main\:table.header.mail
+table.header.online=$org.olat.group.ui.main\:table.header.online
+table.header.participants=$org.olat.group.ui.main\:table.header.participants
+table.header.participantsCount=$org.olat.group.ui.main\:table.header.participantsCount
+table.header.remove=$org.olat.group.ui.main\:table.header.remove
+table.header.role=$org.olat.group.ui.main\:table.header.role
+table.header.tutors=$org.olat.group.ui.main\:table.header.tutors
+table.header.tutorsCount=$org.olat.group.ui.main\:table.header.tutorsCount
+table.header.waitingList=$org.olat.group.ui.main\:table.header.waitingList
+user.notfound=The following users have not been found\: {0}
 cap.launch=\u0141adowanie zasobu edukacyjnego. Prosz\u0119 czeka\u0107...
 chelp.anim=<i>$org.olat.repository\:FileResource.ANIM</i>
 chelp.assOwn=<i>$org.olat.repository\:details.groups</i>
diff --git a/src/main/java/org/olat/repository/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/repository/_i18n/LocalStrings_pt_BR.properties
index 35dc8584eb910a3c13f73b0542c139858914fda6..d7cdc28bb18d5ec28fe1d1317241f9b0203ed518 100644
--- a/src/main/java/org/olat/repository/_i18n/LocalStrings_pt_BR.properties
+++ b/src/main/java/org/olat/repository/_i18n/LocalStrings_pt_BR.properties
@@ -54,6 +54,37 @@ admin.lifecycles.intro=Crie e edite condi\u00E7\u00F5es semestrais para definir
 admin.lifecycles.title=Gest\u00E3o de semestres para cursos
 admin.menu.lifecycle.title=Condi\u00E7\u00F5es de semestre
 allcourses=Todos cursos
+add.member=$org.olat.group.ui.main\:add.member
+assessment=$org.olat.group.ui.main\:assessment
+dialog.modal.bg.leave.text=$org.olat.group.ui.main\:dialog.modal.bg.leave.text
+dialog.modal.bg.send.mail=$org.olat.group.ui.main\:dialog.modal.bg.send.mail
+edit.member=$org.olat.group.ui.main\:edit.member
+edit.member.groups=$org.olat.group.ui.main\:edit.member.groups
+error.atleastone=$org.olat.course.member\:error.atleastone
+error.msg.send.no.rcps=$org.olat.modules.co\:error.msg.send.no.rcps
+home=$org.olat.group.ui.main\:home
+import.member=$org.olat.group.ui.main\:import.member
+mail.member=$org.olat.group.ui.main\:mail.member
+nomembers=XXX No members
+table.header.edit=$org.olat.group.ui.main\:table.header.edit
+table.header.firstName=$org.olat.group.ui.main\:table.header.firstName
+table.header.firstTime=$org.olat.group.ui.main\:table.header.firstTime
+table.header.freePlace=$org.olat.group.ui.main\:table.header.freePlace
+table.header.graduate=$org.olat.group.ui.main\:table.header.graduate
+table.header.groups=$org.olat.group.ui.main\:table.header.groups
+table.header.lastName=$org.olat.group.ui.main\:table.header.lastName
+table.header.lastTime=$org.olat.group.ui.main\:table.header.lastTime
+table.header.login=$org.olat.group.ui.main\:table.header.login
+table.header.mail=$org.olat.group.ui.main\:table.header.mail
+table.header.online=$org.olat.group.ui.main\:table.header.online
+table.header.participants=$org.olat.group.ui.main\:table.header.participants
+table.header.participantsCount=$org.olat.group.ui.main\:table.header.participantsCount
+table.header.remove=$org.olat.group.ui.main\:table.header.remove
+table.header.role=$org.olat.group.ui.main\:table.header.role
+table.header.tutors=$org.olat.group.ui.main\:table.header.tutors
+table.header.tutorsCount=$org.olat.group.ui.main\:table.header.tutorsCount
+table.header.waitingList=$org.olat.group.ui.main\:table.header.waitingList
+user.notfound=Os seguintes usu\u00E1rios n\u00E3o foram encontrados\: {0}
 cap.launch=Carregando recurso did\u00E1tico. Aguarde ...
 chelp.anim=<i>$org.olat.repository\:FileResource.ANIM</i>
 chelp.assOwn=<i>$org.olat.repository\:details.groups</i>
diff --git a/src/main/java/org/olat/repository/controllers/ReferencableEntriesSearchController.java b/src/main/java/org/olat/repository/controllers/ReferencableEntriesSearchController.java
index c027d58ba214cd93463f430fc05f550f2428f311..4979f0e9ed0033866a3b9eb7b57945b3ed4099b3 100644
--- a/src/main/java/org/olat/repository/controllers/ReferencableEntriesSearchController.java
+++ b/src/main/java/org/olat/repository/controllers/ReferencableEntriesSearchController.java
@@ -56,10 +56,10 @@ import org.olat.ims.qti.fileresource.TestFileResource;
 import org.olat.portfolio.EPTemplateMapResource;
 import org.olat.repository.RepositoryEntry;
 import org.olat.repository.RepositoryManager;
-import org.olat.repository.RepositoryTableModel;
 import org.olat.repository.controllers.RepositorySearchController.Can;
 import org.olat.repository.handlers.RepositoryHandler;
 import org.olat.repository.handlers.RepositoryHandlerFactory;
+import org.olat.repository.ui.RepositoryTableModel;
 import org.olat.repository.ui.author.CreateRepositoryEntryController;
 import org.olat.repository.ui.author.ImportRepositoryEntryController;
 
diff --git a/src/main/java/org/olat/repository/controllers/RepositorySearchController.java b/src/main/java/org/olat/repository/controllers/RepositorySearchController.java
index 0e8d0fba0dffce6ee883a9cba8b327c0be9c70f6..e8d0ea0d436bf18306a5bc71ff6aace3c6b4cc77 100644
--- a/src/main/java/org/olat/repository/controllers/RepositorySearchController.java
+++ b/src/main/java/org/olat/repository/controllers/RepositorySearchController.java
@@ -59,9 +59,8 @@ import org.olat.core.id.context.StateEntry;
 import org.olat.core.util.Util;
 import org.olat.repository.RepositoryEntry;
 import org.olat.repository.RepositoryManager;
-import org.olat.repository.RepositoryTableModel;
-import org.olat.repository.SearchForm;
-import org.olat.repository.SearchRepositoryEntryParameters;
+import org.olat.repository.model.SearchRepositoryEntryParameters;
+import org.olat.repository.ui.RepositoryTableModel;
 
 /**
 *  Description:
diff --git a/src/main/java/org/olat/repository/SearchForm.java b/src/main/java/org/olat/repository/controllers/SearchForm.java
similarity index 99%
rename from src/main/java/org/olat/repository/SearchForm.java
rename to src/main/java/org/olat/repository/controllers/SearchForm.java
index 79dfdf8d260c8c61bc52099c5c38d997d1235569..d9e06e3b529a76dd49bcfdf2fc957c9cc7918301 100644
--- a/src/main/java/org/olat/repository/SearchForm.java
+++ b/src/main/java/org/olat/repository/controllers/SearchForm.java
@@ -23,7 +23,7 @@
 * under the Apache 2.0 license as the original file.
 */
 
-package org.olat.repository;
+package org.olat.repository.controllers;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -67,6 +67,7 @@ import org.olat.fileresource.types.XlsFileResource;
 import org.olat.ims.qti.fileresource.SurveyFileResource;
 import org.olat.ims.qti.fileresource.TestFileResource;
 import org.olat.portfolio.EPTemplateMapResource;
+import org.olat.repository.RepositoryModule;
 
 /**
  * Initial Date:  08.07.2003
diff --git a/src/main/java/org/olat/repository/delete/ReadyToDeleteController.java b/src/main/java/org/olat/repository/delete/ReadyToDeleteController.java
index f660d6182f4bb1a55e77929daa6cc2dd3fde11aa..072f27d4e8eb854ae3c00ed40130d0e0e845d753 100644
--- a/src/main/java/org/olat/repository/delete/ReadyToDeleteController.java
+++ b/src/main/java/org/olat/repository/delete/ReadyToDeleteController.java
@@ -49,10 +49,10 @@ import org.olat.core.gui.control.generic.modal.DialogBoxController;
 import org.olat.core.gui.control.generic.modal.DialogBoxUIFactory;
 import org.olat.core.util.Util;
 import org.olat.repository.RepositoryEntry;
-import org.olat.repository.RepositoryEntryTypeColumnDescriptor;
 import org.olat.repository.RepositoryManager;
 import org.olat.repository.RepositoryService;
 import org.olat.repository.delete.service.RepositoryDeletionManager;
+import org.olat.repository.ui.RepositoryEntryTypeColumnDescriptor;
 
 /**
  * Controller for 'Ready-to-delete' tab.
diff --git a/src/main/java/org/olat/repository/delete/SelectionController.java b/src/main/java/org/olat/repository/delete/SelectionController.java
index b0045f1e05912cd14581d73a0a2d2c76c1ee1910..2a89de8f2e4f4218d30235f744676c15524d6536 100644
--- a/src/main/java/org/olat/repository/delete/SelectionController.java
+++ b/src/main/java/org/olat/repository/delete/SelectionController.java
@@ -59,10 +59,10 @@ import org.olat.core.util.Util;
 import org.olat.core.util.mail.MailNotificationEditController;
 import org.olat.core.util.mail.MailTemplate;
 import org.olat.repository.RepositoryEntry;
-import org.olat.repository.RepositoryEntryTypeColumnDescriptor;
 import org.olat.repository.RepositoryManager;
 import org.olat.repository.RepositoryService;
 import org.olat.repository.delete.service.RepositoryDeletionManager;
+import org.olat.repository.ui.RepositoryEntryTypeColumnDescriptor;
 
 /**
  * Controller for tab 'Learning-resource selection' 
diff --git a/src/main/java/org/olat/repository/delete/StatusController.java b/src/main/java/org/olat/repository/delete/StatusController.java
index 5a7faa5f88fd95143c0e39c44f61dc108b6873e5..0052f4f7354808f21a699a60a2cb0551c91ea11e 100644
--- a/src/main/java/org/olat/repository/delete/StatusController.java
+++ b/src/main/java/org/olat/repository/delete/StatusController.java
@@ -46,10 +46,10 @@ import org.olat.core.gui.control.controller.BasicController;
 import org.olat.core.gui.translator.Translator;
 import org.olat.core.util.Util;
 import org.olat.repository.RepositoryEntry;
-import org.olat.repository.RepositoryEntryTypeColumnDescriptor;
 import org.olat.repository.RepositoryManager;
 import org.olat.repository.RepositoryService;
 import org.olat.repository.delete.service.RepositoryDeletionManager;
+import org.olat.repository.ui.RepositoryEntryTypeColumnDescriptor;
 
 /**
  * Controller for tab 'Learning-resource selection' 
diff --git a/src/main/java/org/olat/repository/handlers/WikiHandler.java b/src/main/java/org/olat/repository/handlers/WikiHandler.java
index 2a7eb9270cd786f7f6f48425c39afa56303858fd..83cd35fa202f74993a8de260ee094cf3e37272c0 100644
--- a/src/main/java/org/olat/repository/handlers/WikiHandler.java
+++ b/src/main/java/org/olat/repository/handlers/WikiHandler.java
@@ -78,8 +78,8 @@ import org.olat.modules.wiki.WikiToZipUtils;
 import org.olat.repository.RepositoryEntry;
 import org.olat.repository.RepositoryManager;
 import org.olat.repository.RepositoryService;
-import org.olat.repository.RepositoyUIFactory;
 import org.olat.repository.controllers.WizardCloseResourceController;
+import org.olat.repository.ui.RepositoyUIFactory;
 import org.olat.repository.ui.author.AuthoringEditEntrySettingsController;
 import org.olat.resource.OLATResource;
 import org.olat.resource.OLATResourceManager;
diff --git a/src/main/java/org/olat/repository/manager/RepositoryEntryAuthorViewQueries.java b/src/main/java/org/olat/repository/manager/RepositoryEntryAuthorViewQueries.java
index bae19c59271b229637dfc62cd662180d68ed3f9f..1378c06db44f63b46d19a7500f123e7f34e1cad9 100644
--- a/src/main/java/org/olat/repository/manager/RepositoryEntryAuthorViewQueries.java
+++ b/src/main/java/org/olat/repository/manager/RepositoryEntryAuthorViewQueries.java
@@ -35,7 +35,7 @@ import org.olat.core.logging.Tracing;
 import org.olat.core.util.StringHelper;
 import org.olat.repository.RepositoryEntryAuthorView;
 import org.olat.repository.RepositoryEntryRef;
-import org.olat.repository.SearchAuthorRepositoryEntryViewParams;
+import org.olat.repository.model.SearchAuthorRepositoryEntryViewParams;
 import org.olat.user.UserImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/org/olat/repository/manager/RepositoryEntryMyCourseViewQueries.java b/src/main/java/org/olat/repository/manager/RepositoryEntryMyCourseViewQueries.java
index 2c2f16ee5d6e07b8242b38a69e7c2c59904f6c11..375847f801998ab5013550470e3fe7de15e68f60 100644
--- a/src/main/java/org/olat/repository/manager/RepositoryEntryMyCourseViewQueries.java
+++ b/src/main/java/org/olat/repository/manager/RepositoryEntryMyCourseViewQueries.java
@@ -36,9 +36,9 @@ import org.olat.core.logging.Tracing;
 import org.olat.repository.RepositoryEntry;
 import org.olat.repository.RepositoryEntryMyView;
 import org.olat.repository.RepositoryEntryRef;
-import org.olat.repository.SearchMyRepositoryEntryViewParams;
-import org.olat.repository.SearchMyRepositoryEntryViewParams.Filter;
-import org.olat.repository.SearchMyRepositoryEntryViewParams.OrderBy;
+import org.olat.repository.model.SearchMyRepositoryEntryViewParams;
+import org.olat.repository.model.SearchMyRepositoryEntryViewParams.Filter;
+import org.olat.repository.model.SearchMyRepositoryEntryViewParams.OrderBy;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/src/main/java/org/olat/repository/manager/RepositoryServiceImpl.java b/src/main/java/org/olat/repository/manager/RepositoryServiceImpl.java
index 465718a07bfc2b9cd19a8f556b1ea0eef5b53d24..2cc77b4a7ffc73f1777b29e514121d932ceb0a60 100644
--- a/src/main/java/org/olat/repository/manager/RepositoryServiceImpl.java
+++ b/src/main/java/org/olat/repository/manager/RepositoryServiceImpl.java
@@ -47,12 +47,12 @@ import org.olat.repository.RepositoryEntryMyView;
 import org.olat.repository.RepositoryEntryRef;
 import org.olat.repository.RepositoryEntryRelationType;
 import org.olat.repository.RepositoryService;
-import org.olat.repository.SearchAuthorRepositoryEntryViewParams;
-import org.olat.repository.SearchMyRepositoryEntryViewParams;
 import org.olat.repository.handlers.RepositoryHandler;
 import org.olat.repository.handlers.RepositoryHandlerFactory;
 import org.olat.repository.model.RepositoryEntryStatistics;
 import org.olat.repository.model.RepositoryEntryToGroupRelation;
+import org.olat.repository.model.SearchAuthorRepositoryEntryViewParams;
+import org.olat.repository.model.SearchMyRepositoryEntryViewParams;
 import org.olat.resource.OLATResource;
 import org.olat.resource.OLATResourceManager;
 import org.olat.search.service.document.RepositoryEntryDocument;
diff --git a/src/main/java/org/olat/repository/SearchAuthorRepositoryEntryViewParams.java b/src/main/java/org/olat/repository/model/SearchAuthorRepositoryEntryViewParams.java
similarity index 99%
rename from src/main/java/org/olat/repository/SearchAuthorRepositoryEntryViewParams.java
rename to src/main/java/org/olat/repository/model/SearchAuthorRepositoryEntryViewParams.java
index 9c3d3f97b6e6b7f1a0260feb281942ffd41cbaad..cbcc6a224adbadff8b262b1bc627144dcbbd7ba4 100644
--- a/src/main/java/org/olat/repository/SearchAuthorRepositoryEntryViewParams.java
+++ b/src/main/java/org/olat/repository/model/SearchAuthorRepositoryEntryViewParams.java
@@ -17,7 +17,7 @@
  * 12.10.2011 by frentix GmbH, http://www.frentix.com
  * <p>
  */
-package org.olat.repository;
+package org.olat.repository.model;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/org/olat/repository/SearchMyRepositoryEntryViewParams.java b/src/main/java/org/olat/repository/model/SearchMyRepositoryEntryViewParams.java
similarity index 99%
rename from src/main/java/org/olat/repository/SearchMyRepositoryEntryViewParams.java
rename to src/main/java/org/olat/repository/model/SearchMyRepositoryEntryViewParams.java
index 8c1df723d24b414cda57c55432c6ac690e22cee3..9ba67ffdecfeecc5cc38c9ffcafb6fa23b88a826 100644
--- a/src/main/java/org/olat/repository/SearchMyRepositoryEntryViewParams.java
+++ b/src/main/java/org/olat/repository/model/SearchMyRepositoryEntryViewParams.java
@@ -17,7 +17,7 @@
  * 12.10.2011 by frentix GmbH, http://www.frentix.com
  * <p>
  */
-package org.olat.repository;
+package org.olat.repository.model;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/org/olat/repository/SearchRepositoryEntryParameters.java b/src/main/java/org/olat/repository/model/SearchRepositoryEntryParameters.java
similarity index 99%
rename from src/main/java/org/olat/repository/SearchRepositoryEntryParameters.java
rename to src/main/java/org/olat/repository/model/SearchRepositoryEntryParameters.java
index e3e196948451ecacb68b0c7002f51840c290d6e2..1e743d6a93eaf7a4e6b1e02ba4b842f34e20b4f2 100644
--- a/src/main/java/org/olat/repository/SearchRepositoryEntryParameters.java
+++ b/src/main/java/org/olat/repository/model/SearchRepositoryEntryParameters.java
@@ -17,7 +17,7 @@
  * 12.10.2011 by frentix GmbH, http://www.frentix.com
  * <p>
  */
-package org.olat.repository;
+package org.olat.repository.model;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/org/olat/repository/portlet/RepositoryPortletRunController.java b/src/main/java/org/olat/repository/portlet/RepositoryPortletRunController.java
index e48105be06ff079a1936dca01792ce2a4724a544..262bc7a83b56fb6a07beb00a24499921aeba5044 100644
--- a/src/main/java/org/olat/repository/portlet/RepositoryPortletRunController.java
+++ b/src/main/java/org/olat/repository/portlet/RepositoryPortletRunController.java
@@ -49,8 +49,8 @@ import org.olat.core.util.event.GenericEventListener;
 import org.olat.repository.RepositoryEntry;
 import org.olat.repository.RepositoryEntryLight;
 import org.olat.repository.RepositoryEntryOrder;
-import org.olat.repository.RepositoryEntryTypeColumnDescriptor;
 import org.olat.repository.RepositoryManager;
+import org.olat.repository.ui.RepositoryEntryTypeColumnDescriptor;
 
 
 /**
diff --git a/src/main/java/org/olat/repository/RepositoryEntryACColumnDescriptor.java b/src/main/java/org/olat/repository/ui/RepositoryEntryACColumnDescriptor.java
similarity index 98%
rename from src/main/java/org/olat/repository/RepositoryEntryACColumnDescriptor.java
rename to src/main/java/org/olat/repository/ui/RepositoryEntryACColumnDescriptor.java
index 5b9adaa89a0111fc838ed8cbc694cd11ed8be743..b94cee7608f12dade464e2510a6a3c3c8775b532 100644
--- a/src/main/java/org/olat/repository/RepositoryEntryACColumnDescriptor.java
+++ b/src/main/java/org/olat/repository/ui/RepositoryEntryACColumnDescriptor.java
@@ -17,7 +17,7 @@
  * frentix GmbH, http://www.frentix.com
  * <p>
  */
-package org.olat.repository;
+package org.olat.repository.ui;
 
 import java.util.Collection;
 import java.util.Locale;
diff --git a/src/main/java/org/olat/repository/RepositoryEntryIconRenderer.java b/src/main/java/org/olat/repository/ui/RepositoryEntryIconRenderer.java
similarity index 96%
rename from src/main/java/org/olat/repository/RepositoryEntryIconRenderer.java
rename to src/main/java/org/olat/repository/ui/RepositoryEntryIconRenderer.java
index 3aa00a0d6f0a5866eb67c8644def5f64cb10e809..f2025fb407117604f0f8ed65abb0c51b832a14fe 100644
--- a/src/main/java/org/olat/repository/RepositoryEntryIconRenderer.java
+++ b/src/main/java/org/olat/repository/ui/RepositoryEntryIconRenderer.java
@@ -17,7 +17,7 @@
  * frentix GmbH, http://www.frentix.com
  * <p>
  */
-package org.olat.repository;
+package org.olat.repository.ui;
 
 import java.util.Locale;
 
@@ -25,6 +25,8 @@ import org.olat.NewControllerFactory;
 import org.olat.core.gui.components.table.CustomCssCellRenderer;
 import org.olat.core.util.StringHelper;
 import org.olat.core.util.i18n.I18nModule;
+import org.olat.repository.RepositoryEntry;
+import org.olat.repository.RepositoryEntryShort;
 
 /**
  * Description:<br>
diff --git a/src/main/java/org/olat/repository/RepositoryEntryTypeColumnDescriptor.java b/src/main/java/org/olat/repository/ui/RepositoryEntryTypeColumnDescriptor.java
similarity index 97%
rename from src/main/java/org/olat/repository/RepositoryEntryTypeColumnDescriptor.java
rename to src/main/java/org/olat/repository/ui/RepositoryEntryTypeColumnDescriptor.java
index 827e0a6590d59189e1a87b0a93bee880ef33ff18..56e2f02c9cc75c4358539922c3b5605a0d7eb189 100644
--- a/src/main/java/org/olat/repository/RepositoryEntryTypeColumnDescriptor.java
+++ b/src/main/java/org/olat/repository/ui/RepositoryEntryTypeColumnDescriptor.java
@@ -17,11 +17,12 @@
  * frentix GmbH, http://www.frentix.com
  * <p>
  */
-package org.olat.repository;
+package org.olat.repository.ui;
 
 import java.util.Locale;
 
 import org.olat.core.gui.components.table.CustomRenderColumnDescriptor;
+import org.olat.repository.RepositoryEntry;
 
 /**
  * Description:<br>
diff --git a/src/main/java/org/olat/repository/RepositoryTableModel.java b/src/main/java/org/olat/repository/ui/RepositoryTableModel.java
similarity index 98%
rename from src/main/java/org/olat/repository/RepositoryTableModel.java
rename to src/main/java/org/olat/repository/ui/RepositoryTableModel.java
index 27664049dfb89cc5916435c1fcd23e4cbe770821..609f237f2566eb934f85b5bd730ca83caf2523da 100644
--- a/src/main/java/org/olat/repository/RepositoryTableModel.java
+++ b/src/main/java/org/olat/repository/ui/RepositoryTableModel.java
@@ -23,7 +23,7 @@
 * under the Apache 2.0 license as the original file.
 */
 
-package org.olat.repository;
+package org.olat.repository.ui;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -47,9 +47,12 @@ import org.olat.core.gui.translator.Translator;
 import org.olat.core.util.StringHelper;
 import org.olat.core.util.Util;
 import org.olat.login.LoginModule;
+import org.olat.repository.RepositoryEntry;
+import org.olat.repository.RepositoryEntryStatus;
+import org.olat.repository.RepositoryManager;
+import org.olat.repository.RepositoryModule;
 import org.olat.repository.manager.RepositoryEntryLifecycleDAO;
 import org.olat.repository.model.RepositoryEntryLifecycle;
-import org.olat.repository.ui.RepositoryEntryAccessColumnDescriptor;
 import org.olat.resource.accesscontrol.ACService;
 import org.olat.resource.accesscontrol.AccessControlModule;
 import org.olat.resource.accesscontrol.model.OLATResourceAccess;
diff --git a/src/main/java/org/olat/repository/RepositoyUIFactory.java b/src/main/java/org/olat/repository/ui/RepositoyUIFactory.java
similarity index 96%
rename from src/main/java/org/olat/repository/RepositoyUIFactory.java
rename to src/main/java/org/olat/repository/ui/RepositoyUIFactory.java
index 8ff89473d2f3fb00e35eb7820d16832ef8e9411d..3e9c9c454c0c1d0058d4ea6c946b0962f5b426fb 100644
--- a/src/main/java/org/olat/repository/RepositoyUIFactory.java
+++ b/src/main/java/org/olat/repository/ui/RepositoyUIFactory.java
@@ -22,7 +22,7 @@
 * This file has been modified by the OpenOLAT community. Changes are licensed
 * under the Apache 2.0 license as the original file.
 */
-package org.olat.repository;
+package org.olat.repository.ui;
 
 import org.olat.core.CoreSpringFactory;
 import org.olat.core.commons.fullWebApp.LayoutMain3ColsController;
@@ -41,9 +41,12 @@ import org.olat.core.id.context.BusinessControlFactory;
 import org.olat.core.id.context.ContextEntry;
 import org.olat.core.logging.AssertException;
 import org.olat.core.util.Util;
+import org.olat.repository.RepositoryEntry;
+import org.olat.repository.RepositoryEntryShort;
+import org.olat.repository.RepositoryManager;
+import org.olat.repository.RepositoryService;
 import org.olat.repository.handlers.RepositoryHandler;
 import org.olat.repository.handlers.RepositoryHandlerFactory;
-import org.olat.repository.ui.LifecycleAdminController;
 
 /**
  * Description:<br>
diff --git a/src/main/java/org/olat/repository/ui/author/AuthorListController.java b/src/main/java/org/olat/repository/ui/author/AuthorListController.java
index 5e97133341752c554cc353d34e80928c1355e476..a1fc770d0ee2ee925dffd029ff50fdab15a71975 100644
--- a/src/main/java/org/olat/repository/ui/author/AuthorListController.java
+++ b/src/main/java/org/olat/repository/ui/author/AuthorListController.java
@@ -72,9 +72,9 @@ import org.olat.repository.RepositoryEntryAuthorView;
 import org.olat.repository.RepositoryEntryRef;
 import org.olat.repository.RepositoryManager;
 import org.olat.repository.RepositoryService;
-import org.olat.repository.SearchAuthorRepositoryEntryViewParams;
 import org.olat.repository.handlers.RepositoryHandler;
 import org.olat.repository.handlers.RepositoryHandlerFactory;
+import org.olat.repository.model.SearchAuthorRepositoryEntryViewParams;
 import org.olat.repository.model.TransientRepositoryEntryRef;
 import org.olat.repository.ui.author.AuthoringEntryDataModel.Cols;
 import org.olat.util.logging.activity.LoggingResourceable;
@@ -91,12 +91,12 @@ public class AuthorListController extends FormBasicController implements Activat
 	private FlexiTableElement tableEl;
 	private final TooledStackedPanel stackPanel;
 	
+	private boolean startExtendedSearch;
 	
 	private AuthoringEntryDataModel model;
 	private AuthoringEntryDataSource dataSource;
 	private final SearchAuthorRepositoryEntryViewParams searchParams;
 
-	
 	private CloseableModalController cmc;
 	private StepsMainRunController wizardCtrl;
 	private AuthorSearchController searchCtrl;
@@ -117,11 +117,12 @@ public class AuthorListController extends FormBasicController implements Activat
 	private RepositoryHandlerFactory repositoryHandlerFactory;
 	
 	public AuthorListController(UserRequest ureq, WindowControl wControl, String i18nName,
-			SearchAuthorRepositoryEntryViewParams searchParams) {
+			SearchAuthorRepositoryEntryViewParams searchParams, boolean startExtendedSearch) {
 		super(ureq, wControl, "entries");
 		setTranslator(Util.createPackageTranslator(RepositoryManager.class, getLocale(), getTranslator()));
 
 		this.searchParams = searchParams;
+		this.startExtendedSearch = startExtendedSearch;
 		
 		importLink = LinkFactory.createLink("cmd.import.ressource", getTranslator(), this);
 		importLink.setDomReplacementWrapperRequired(false);
@@ -160,7 +161,7 @@ public class AuthorListController extends FormBasicController implements Activat
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 		//search form
-		searchCtrl = new AuthorSearchController(ureq, getWindowControl(), true, mainForm);
+		searchCtrl = new AuthorSearchController(ureq, getWindowControl(), true, !startExtendedSearch, mainForm);
 		listenTo(searchCtrl);
 		
 		//add the table
@@ -188,15 +189,20 @@ public class AuthorListController extends FormBasicController implements Activat
 				new StaticFlexiCellRenderer("" /* translate("edit") */, "edit", "o_icon-lg o_icon_edit")));
 		
 		model = new AuthoringEntryDataModel(dataSource, columnsModel);
-		tableEl = uifactory.addTableElement(ureq, getWindowControl(), "table", model, 20, getTranslator(), formLayout);
+		tableEl = uifactory.addTableElement(ureq, getWindowControl(), "table", model, 20, !startExtendedSearch, getTranslator(), formLayout);
 		tableEl.setSearchEnabled(true);
 		tableEl.setExportEnabled(true);
 		tableEl.setExtendedSearch(searchCtrl, false);
 		tableEl.setCustomizeColumns(true);
 		tableEl.setElementCssClass("o_coursetable");
-		tableEl.setFilters(null, getFilters());
 		tableEl.setMultiSelect(true);
 		
+		if(startExtendedSearch) {
+			tableEl.expandExtendedSearch(ureq);
+		} else {
+			tableEl.setFilters(null, getFilters());
+		}
+		
 		addOwnersButton = uifactory.addFormLink("tools.add.owners", formLayout, Link.BUTTON);
 	}
 	
diff --git a/src/main/java/org/olat/repository/ui/author/AuthorSearchController.java b/src/main/java/org/olat/repository/ui/author/AuthorSearchController.java
index d30e9cd7c44b036d1b0e447aa9376fcfce7babd0..f5cb90c6692485e32b65c221347f205369d48311 100644
--- a/src/main/java/org/olat/repository/ui/author/AuthorSearchController.java
+++ b/src/main/java/org/olat/repository/ui/author/AuthorSearchController.java
@@ -61,21 +61,24 @@ public class AuthorSearchController extends FormBasicController implements Exten
 	
 	private String[] limitTypes;
 	private boolean isAdmin;
+	private boolean cancelAllowed;
 	
 	@Autowired
 	private RepositoryHandlerFactory repositoryHandlerFactory;
 	
-	public AuthorSearchController(UserRequest ureq, WindowControl wControl, boolean isAdmin) {
+	public AuthorSearchController(UserRequest ureq, WindowControl wControl, boolean isAdmin, boolean cancelAllowed) {
 		super(ureq, wControl, "search");
 		setTranslator(Util.createPackageTranslator(RepositoryManager.class, getLocale(), getTranslator()));
 		this.isAdmin = isAdmin;
+		this.cancelAllowed = cancelAllowed;
 		initForm(ureq);
 	}
 
-	public AuthorSearchController(UserRequest ureq, WindowControl wControl, boolean isAdmin, Form form) {
+	public AuthorSearchController(UserRequest ureq, WindowControl wControl, boolean isAdmin, boolean cancelAllowed, Form form) {
 		super(ureq, wControl, LAYOUT_CUSTOM, "search", form);
 		setTranslator(Util.createPackageTranslator(RepositoryManager.class, getLocale(), getTranslator()));
 		this.isAdmin = isAdmin;
+		this.cancelAllowed = cancelAllowed;
 		initForm(ureq);
 	}
 	
@@ -112,7 +115,9 @@ public class AuthorSearchController extends FormBasicController implements Exten
 		FormLayoutContainer buttonLayout = FormLayoutContainer.createButtonLayout("button_layout", getTranslator());
 		formLayout.add(buttonLayout);
 		searchButton = uifactory.addFormLink("search", buttonLayout, Link.BUTTON);
-		uifactory.addFormCancelButton("quick.search", buttonLayout, ureq, getWindowControl());
+		if(cancelAllowed) {
+			uifactory.addFormCancelButton("quick.search", buttonLayout, ureq, getWindowControl());
+		}
 	}
 
 	@Override
diff --git a/src/main/java/org/olat/repository/ui/author/AuthoringEditAccessController.java b/src/main/java/org/olat/repository/ui/author/AuthoringEditAccessController.java
index afc80da2b58339e5a2e3fd5d365241e632bc0a23..e3fb3d31185a72ffb7d412118722885c857e923e 100644
--- a/src/main/java/org/olat/repository/ui/author/AuthoringEditAccessController.java
+++ b/src/main/java/org/olat/repository/ui/author/AuthoringEditAccessController.java
@@ -29,7 +29,6 @@ import org.olat.core.gui.control.controller.BasicController;
 import org.olat.core.util.Util;
 import org.olat.core.util.coordinate.CoordinatorManager;
 import org.olat.core.util.event.MultiUserEvent;
-import org.olat.repository.PropPupForm;
 import org.olat.repository.RepositoryEntry;
 import org.olat.repository.RepositoryEntryManagedFlag;
 import org.olat.repository.RepositoryManager;
diff --git a/src/main/java/org/olat/repository/ui/author/AuthoringEditEntrySettingsController.java b/src/main/java/org/olat/repository/ui/author/AuthoringEditEntrySettingsController.java
index c1a3d0ee4deed1e156a0d72e77cabdc2247a16c4..da91a10245056e19cb328040b5805c2981a47540 100644
--- a/src/main/java/org/olat/repository/ui/author/AuthoringEditEntrySettingsController.java
+++ b/src/main/java/org/olat/repository/ui/author/AuthoringEditEntrySettingsController.java
@@ -19,7 +19,6 @@
  */
 package org.olat.repository.ui.author;
 
-import org.olat.core.CoreSpringFactory;
 import org.olat.core.gui.UserRequest;
 import org.olat.core.gui.components.Component;
 import org.olat.core.gui.components.stack.TooledStackedPanel;
@@ -33,9 +32,9 @@ import org.olat.core.util.Util;
 import org.olat.repository.RepositoryEntry;
 import org.olat.repository.RepositoryEntryRef;
 import org.olat.repository.RepositoryService;
-import org.olat.repository.controllers.RepositoryEditDescriptionController;
 import org.olat.repository.handlers.RepositoryHandler;
 import org.olat.repository.handlers.RepositoryHandlerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * 
@@ -50,13 +49,14 @@ public class AuthoringEditEntrySettingsController extends BasicController {
 	private final RepositoryEditDescriptionController descriptionCtrl;
 	
 	private RepositoryEntry entry;
+	@Autowired
 	private RepositoryService repositoryService;
 	
 	public AuthoringEditEntrySettingsController(UserRequest ureq, WindowControl wControl, TooledStackedPanel stackPanel,
 			RepositoryEntryRef entryRef) {
 		super(ureq, wControl);
 		setTranslator(Util.createPackageTranslator(RepositoryService.class, getLocale(), getTranslator()));
-		repositoryService = CoreSpringFactory.getImpl(RepositoryService.class);
+
 		entry = repositoryService.loadByKey(entryRef.getKey());
 
 		descriptionCtrl = new RepositoryEditDescriptionController(ureq, getWindowControl(), entry, false);
diff --git a/src/main/java/org/olat/repository/ui/author/AuthoringEntryDataSource.java b/src/main/java/org/olat/repository/ui/author/AuthoringEntryDataSource.java
index e5ebabeb6f3abc6fc23e8174179b5dbebcf54697..3684e81834582b00533323d685b474a5fe4233af 100644
--- a/src/main/java/org/olat/repository/ui/author/AuthoringEntryDataSource.java
+++ b/src/main/java/org/olat/repository/ui/author/AuthoringEntryDataSource.java
@@ -37,7 +37,7 @@ import org.olat.core.logging.Tracing;
 import org.olat.core.util.StringHelper;
 import org.olat.repository.RepositoryEntryAuthorView;
 import org.olat.repository.RepositoryService;
-import org.olat.repository.SearchAuthorRepositoryEntryViewParams;
+import org.olat.repository.model.SearchAuthorRepositoryEntryViewParams;
 import org.olat.repository.ui.PriceMethod;
 import org.olat.resource.OLATResource;
 import org.olat.resource.accesscontrol.ACService;
diff --git a/src/main/java/org/olat/repository/ui/author/AuthoringEntryDetailsController.java b/src/main/java/org/olat/repository/ui/author/AuthoringEntryDetailsController.java
index f9c6e799c9d022ed8fcc1a85373030aeb430d81e..dce55eee3ed86166a3763a1ce6ea7f7d17f65f2e 100644
--- a/src/main/java/org/olat/repository/ui/author/AuthoringEntryDetailsController.java
+++ b/src/main/java/org/olat/repository/ui/author/AuthoringEntryDetailsController.java
@@ -80,13 +80,12 @@ import org.olat.repository.RepositoryEntryManagedFlag;
 import org.olat.repository.RepositoryManager;
 import org.olat.repository.RepositoryModule;
 import org.olat.repository.RepositoryService;
-import org.olat.repository.RepositoyUIFactory;
 import org.olat.repository.controllers.EntryChangedEvent;
-import org.olat.repository.controllers.RepositoryMembersController;
 import org.olat.repository.controllers.WizardCloseResourceController;
 import org.olat.repository.handlers.RepositoryHandler;
 import org.olat.repository.handlers.RepositoryHandlerFactory;
 import org.olat.repository.ui.PriceMethod;
+import org.olat.repository.ui.RepositoyUIFactory;
 import org.olat.resource.OLATResource;
 import org.olat.resource.accesscontrol.ACService;
 import org.olat.resource.accesscontrol.AccessResult;
diff --git a/src/main/java/org/olat/repository/ui/author/CatalogSettingsController.java b/src/main/java/org/olat/repository/ui/author/CatalogSettingsController.java
index 9e7e7b93b15a9a520edf8b4cb46bfe3efce28515..94eb077eaba4aef56e8f8a956ff26a00e2168ef0 100644
--- a/src/main/java/org/olat/repository/ui/author/CatalogSettingsController.java
+++ b/src/main/java/org/olat/repository/ui/author/CatalogSettingsController.java
@@ -94,7 +94,7 @@ public class CatalogSettingsController extends FormBasicController {
 		
 		List<CatalogEntry> catalogEntries = catalogManager.getCatalogCategoriesFor(entry);
 		model = new CategoriesListModel(catalogEntries, columnsModel);
-		tableEl = uifactory.addTableElement(ureq, getWindowControl(), "table", model, 200, getTranslator(), formLayout);
+		tableEl = uifactory.addTableElement(ureq, getWindowControl(), "table", model, 200, true, getTranslator(), formLayout);
 		tableEl.setCustomizeColumns(false);
 	}
 	
diff --git a/src/main/java/org/olat/repository/ui/author/OverviewAuthoringController.java b/src/main/java/org/olat/repository/ui/author/OverviewAuthoringController.java
index d7e5ff232e97947143b707b8641e15a9c01c1705..4f7e13167def2e045f28a4586378b36d8ff38de8 100644
--- a/src/main/java/org/olat/repository/ui/author/OverviewAuthoringController.java
+++ b/src/main/java/org/olat/repository/ui/author/OverviewAuthoringController.java
@@ -43,8 +43,8 @@ import org.olat.core.logging.activity.ThreadLocalUserActivityLogger;
 import org.olat.core.util.Util;
 import org.olat.core.util.resource.OresHelper;
 import org.olat.repository.RepositoryManager;
-import org.olat.repository.SearchAuthorRepositoryEntryViewParams;
 import org.olat.repository.handlers.RepositoryHandlerFactory;
+import org.olat.repository.model.SearchAuthorRepositoryEntryViewParams;
 import org.olat.user.UserManager;
 import org.olat.util.logging.activity.LoggingResourceable;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -145,7 +145,7 @@ public class OverviewAuthoringController extends BasicController implements Acti
 			OLATResourceable ores = OresHelper.createOLATResourceableInstance("Favorits", 0l);
 			ThreadLocalUserActivityLogger.addLoggingResourceInfo(LoggingResourceable.wrapBusinessPath(ores));
 			WindowControl bwControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ores, null, getWindowControl());
-			markedCtrl = new AuthorListController(ureq, bwControl, "search.mark", searchParams);
+			markedCtrl = new AuthorListController(ureq, bwControl, "search.mark", searchParams, false);
 			listenTo(markedCtrl);
 		}
 		
@@ -162,7 +162,7 @@ public class OverviewAuthoringController extends BasicController implements Acti
 			OLATResourceable ores = OresHelper.createOLATResourceableInstance("My", 0l);
 			ThreadLocalUserActivityLogger.addLoggingResourceInfo(LoggingResourceable.wrapBusinessPath(ores));
 			WindowControl bwControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ores, null, getWindowControl());
-			myEntriesCtrl = new AuthorListController(ureq, bwControl, "search.my", searchParams);
+			myEntriesCtrl = new AuthorListController(ureq, bwControl, "search.my", searchParams, false);
 			listenTo(myEntriesCtrl);
 		}
 
@@ -179,8 +179,7 @@ public class OverviewAuthoringController extends BasicController implements Acti
 			OLATResourceable ores = OresHelper.createOLATResourceableInstance("Search", 0l);
 			ThreadLocalUserActivityLogger.addLoggingResourceInfo(LoggingResourceable.wrapBusinessPath(ores));
 			WindowControl bwControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ores, null, getWindowControl());
-			searchEntriesCtrl = new AuthorListController(ureq, bwControl, "search.generic", searchParams);
-			listenTo(searchEntriesCtrl);
+			searchEntriesCtrl = new AuthorListController(ureq, bwControl, "search.generic", searchParams, true);
 		}
 		
 		addToHistory(ureq, searchEntriesCtrl);
diff --git a/src/main/java/org/olat/repository/PropPupForm.java b/src/main/java/org/olat/repository/ui/author/PropPupForm.java
similarity index 97%
rename from src/main/java/org/olat/repository/PropPupForm.java
rename to src/main/java/org/olat/repository/ui/author/PropPupForm.java
index 7bc401e9e990e5e84aadf694cacfd0c4dc970002..70e279448df38ed5123386d6aabd03d3e406154b 100644
--- a/src/main/java/org/olat/repository/PropPupForm.java
+++ b/src/main/java/org/olat/repository/ui/author/PropPupForm.java
@@ -23,7 +23,7 @@
 * under the Apache 2.0 license as the original file.
 */
 
-package org.olat.repository;
+package org.olat.repository.ui.author;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -42,6 +42,8 @@ import org.olat.fileresource.types.ScormCPFileResource;
 import org.olat.ims.qti.fileresource.SurveyFileResource;
 import org.olat.ims.qti.fileresource.TestFileResource;
 import org.olat.login.LoginModule;
+import org.olat.repository.RepositoryEntry;
+import org.olat.repository.RepositoryEntryManagedFlag;
 import org.olat.repository.handlers.RepositoryHandler;
 import org.olat.repository.handlers.RepositoryHandlerFactory;
 
@@ -66,7 +68,7 @@ public class PropPupForm extends FormBasicController {
 	
 	private String[] keys, values;
 	
-	private RepositoryHandler handler = null;
+	private RepositoryHandler handler;
 	/**
 	 * The details form is initialized with data collected from entry and typeName. Handler is looked-up by
 	 * the given handlerName and not by the entry's resourceableType. This is to allow for an entry with no resourceable
diff --git a/src/main/java/org/olat/repository/controllers/RepositoryEditDescriptionController.java b/src/main/java/org/olat/repository/ui/author/RepositoryEditDescriptionController.java
similarity index 93%
rename from src/main/java/org/olat/repository/controllers/RepositoryEditDescriptionController.java
rename to src/main/java/org/olat/repository/ui/author/RepositoryEditDescriptionController.java
index 4a5fabb5da2bf276614ac8ad44d8110925835b91..21285047c0952edb8cd107fa7e60bd92d2327047 100644
--- a/src/main/java/org/olat/repository/controllers/RepositoryEditDescriptionController.java
+++ b/src/main/java/org/olat/repository/ui/author/RepositoryEditDescriptionController.java
@@ -23,7 +23,7 @@
 * under the Apache 2.0 license as the original file.
 */
 
-package org.olat.repository.controllers;
+package org.olat.repository.ui.author;
 
 import java.io.File;
 import java.util.Date;
@@ -33,7 +33,6 @@ import java.util.Set;
 import java.util.UUID;
 
 import org.olat.NewControllerFactory;
-import org.olat.core.CoreSpringFactory;
 import org.olat.core.gui.UserRequest;
 import org.olat.core.gui.components.form.flexible.FormItem;
 import org.olat.core.gui.components.form.flexible.FormItemContainer;
@@ -63,13 +62,14 @@ import org.olat.repository.RepositoryEntry;
 import org.olat.repository.RepositoryEntryManagedFlag;
 import org.olat.repository.RepositoryManager;
 import org.olat.repository.RepositoryService;
-import org.olat.repository.RepositoyUIFactory;
+import org.olat.repository.controllers.MediaContainerFilter;
 import org.olat.repository.handlers.RepositoryHandler;
 import org.olat.repository.handlers.RepositoryHandlerFactory;
 import org.olat.repository.manager.RepositoryEntryLifecycleDAO;
 import org.olat.repository.model.RepositoryEntryLifecycle;
 import org.olat.resource.OLATResource;
 import org.olat.user.UserManager;
+import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * Description:<br>
@@ -108,10 +108,14 @@ public class RepositoryEditDescriptionController extends FormBasicController {
 	
 	private static final String[] dateKeys = new String[]{ "none", "private", "public"};
 
-	private final UserManager userManager;
-	private final RepositoryService repositoryService;
-	private final RepositoryManager repositoryManager;
-	private final RepositoryEntryLifecycleDAO lifecycleDao;
+	@Autowired
+	private UserManager userManager;
+	@Autowired
+	private RepositoryService repositoryService;
+	@Autowired
+	private RepositoryManager repositoryManager;
+	@Autowired
+	private RepositoryEntryLifecycleDAO lifecycleDao;
 
 	/**
 	 * Create a repository add controller that adds the given resourceable.
@@ -122,11 +126,7 @@ public class RepositoryEditDescriptionController extends FormBasicController {
 	 */
 	public RepositoryEditDescriptionController(UserRequest ureq, WindowControl wControl, RepositoryEntry entry, boolean isSubWorkflow) {
 		super(ureq, wControl, "bgrep");
-		setBasePackage(RepositoryManager.class);
-		userManager = CoreSpringFactory.getImpl(UserManager.class);
-		repositoryService = CoreSpringFactory.getImpl(RepositoryService.class);
-		repositoryManager = CoreSpringFactory.getImpl(RepositoryManager.class);
-		lifecycleDao = CoreSpringFactory.getImpl(RepositoryEntryLifecycleDAO.class);
+		setBasePackage(RepositoryService.class);
 		this.isSubWorkflow = isSubWorkflow;
 		this.repositoryEntry = entry;
 		repoEntryType = repositoryEntry.getOlatResource().getResourceableTypeName();
@@ -157,19 +157,17 @@ public class RepositoryEditDescriptionController extends FormBasicController {
 		// Add resource type
 		String typeName = null;
 		OLATResource res = repositoryEntry.getOlatResource();
-		if (res != null) typeName = res.getResourceableTypeName();
-		StringBuilder typeDisplayText = new StringBuilder(100);
+		if (res != null) {
+			typeName = res.getResourceableTypeName();
+		}
+		
+		String typeDisplay ;
 		if (typeName != null) { // add image and typename code
-			typeDisplayText.append("<span class=\"b_with_small_icon_left ");
-			typeDisplayText.append(RepositoyUIFactory.getIconCssClass(repositoryEntry));
-			typeDisplayText.append("\">");
-			String tName = NewControllerFactory.translateResourceableTypeName(typeName, getLocale());
-			typeDisplayText.append(tName);
-			typeDisplayText.append("</span>");
+			typeDisplay = NewControllerFactory.translateResourceableTypeName(typeName, getLocale());
 		} else {
-			typeDisplayText.append(translate("cif.type.na"));
+			typeDisplay = translate("cif.type.na");
 		}
-		uifactory.addStaticExampleText("cif.type", typeDisplayText.toString(), descCont);
+		uifactory.addStaticExampleText("cif.type", typeDisplay, descCont);
 		
 		uifactory.addSpacerElement("spacer1", descCont, false);
 
diff --git a/src/main/java/org/olat/repository/controllers/RepositoryMembersController.java b/src/main/java/org/olat/repository/ui/author/RepositoryMembersController.java
similarity index 94%
rename from src/main/java/org/olat/repository/controllers/RepositoryMembersController.java
rename to src/main/java/org/olat/repository/ui/author/RepositoryMembersController.java
index a7253e1e7cfbf5a4dae1c41bdd81d902f9861278..300c0b53da9c27c57b75b6992a0d3843184dee53 100644
--- a/src/main/java/org/olat/repository/controllers/RepositoryMembersController.java
+++ b/src/main/java/org/olat/repository/ui/author/RepositoryMembersController.java
@@ -17,11 +17,10 @@
  * 12.10.2011 by frentix GmbH, http://www.frentix.com
  * <p>
  */
-package org.olat.repository.controllers;
+package org.olat.repository.ui.author;
 
 import java.util.List;
 
-import org.olat.core.CoreSpringFactory;
 import org.olat.core.gui.UserRequest;
 import org.olat.core.gui.components.Component;
 import org.olat.core.gui.components.link.Link;
@@ -34,6 +33,7 @@ import org.olat.core.gui.control.generic.wizard.StepRunnerCallback;
 import org.olat.core.gui.control.generic.wizard.StepsMainRunController;
 import org.olat.core.gui.control.generic.wizard.StepsRunContext;
 import org.olat.core.id.Identity;
+import org.olat.core.util.Util;
 import org.olat.core.util.mail.MailHelper;
 import org.olat.core.util.mail.MailPackage;
 import org.olat.core.util.mail.MailTemplate;
@@ -48,7 +48,9 @@ import org.olat.group.ui.main.SearchMembersParams;
 import org.olat.repository.RepositoryEntry;
 import org.olat.repository.RepositoryEntryManagedFlag;
 import org.olat.repository.RepositoryManager;
+import org.olat.repository.RepositoryService;
 import org.olat.repository.model.RepositoryEntryPermissionChangeEvent;
+import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * 
@@ -62,15 +64,15 @@ public class RepositoryMembersController extends AbstractMemberListController {
 	private Link importMemberLink, addMemberLink;
 	private StepsMainRunController importMembersWizard;
 	
-	private final RepositoryManager repositoryManager;
-	private final BusinessGroupService businessGroupService;
+	@Autowired
+	private RepositoryManager repositoryManager;
+	@Autowired
+	private BusinessGroupService businessGroupService;
 
 	public RepositoryMembersController(UserRequest ureq, WindowControl wControl, RepositoryEntry repoEntry) {
-		super(ureq, wControl, repoEntry, "all_member_list");
+		super(ureq, wControl, repoEntry, null, "all_member_list",
+				Util.createPackageTranslator(RepositoryService.class, ureq.getLocale()));
 		
-		repositoryManager = CoreSpringFactory.getImpl(RepositoryManager.class);
-		businessGroupService = CoreSpringFactory.getImpl(BusinessGroupService.class);
-
 		this.repoEntry = repoEntry;
 		boolean managed = RepositoryEntryManagedFlag.isManaged(repoEntry, RepositoryEntryManagedFlag.membersmanagement);
 		addMemberLink = LinkFactory.createButton("add.member", mainVC, this);
diff --git a/src/main/java/org/olat/repository/controllers/_content/all_member_list.html b/src/main/java/org/olat/repository/ui/author/_content/all_member_list.html
similarity index 100%
rename from src/main/java/org/olat/repository/controllers/_content/all_member_list.html
rename to src/main/java/org/olat/repository/ui/author/_content/all_member_list.html
diff --git a/src/main/java/org/olat/repository/controllers/_content/bgrep.html b/src/main/java/org/olat/repository/ui/author/_content/bgrep.html
similarity index 100%
rename from src/main/java/org/olat/repository/controllers/_content/bgrep.html
rename to src/main/java/org/olat/repository/ui/author/_content/bgrep.html
diff --git a/src/main/java/org/olat/repository/ui/list/CatalogNodeController.java b/src/main/java/org/olat/repository/ui/list/CatalogNodeController.java
index c82b5d9bc874eb5eb9b677ad5e822492b0fb8f95..953731cf5fe2ba915317ad3bbe81f12e7553671c 100644
--- a/src/main/java/org/olat/repository/ui/list/CatalogNodeController.java
+++ b/src/main/java/org/olat/repository/ui/list/CatalogNodeController.java
@@ -43,7 +43,7 @@ import org.olat.core.util.StringHelper;
 import org.olat.core.util.Util;
 import org.olat.core.util.vfs.VFSLeaf;
 import org.olat.repository.RepositoryManager;
-import org.olat.repository.SearchMyRepositoryEntryViewParams;
+import org.olat.repository.model.SearchMyRepositoryEntryViewParams;
 import org.olat.repository.ui.CatalogEntryImageMapper;
 
 /**
diff --git a/src/main/java/org/olat/repository/ui/list/DefaultRepositoryEntryDataSource.java b/src/main/java/org/olat/repository/ui/list/DefaultRepositoryEntryDataSource.java
index 64c80c369410799fec7e073c39ce0ee765d21b2d..c710fccd233c5311b24f04ec79e650429426853d 100644
--- a/src/main/java/org/olat/repository/ui/list/DefaultRepositoryEntryDataSource.java
+++ b/src/main/java/org/olat/repository/ui/list/DefaultRepositoryEntryDataSource.java
@@ -36,9 +36,9 @@ import org.olat.core.util.vfs.VFSLeaf;
 import org.olat.repository.RepositoryEntryMyView;
 import org.olat.repository.RepositoryManager;
 import org.olat.repository.RepositoryService;
-import org.olat.repository.SearchMyRepositoryEntryViewParams;
-import org.olat.repository.SearchMyRepositoryEntryViewParams.Filter;
-import org.olat.repository.SearchMyRepositoryEntryViewParams.OrderBy;
+import org.olat.repository.model.SearchMyRepositoryEntryViewParams;
+import org.olat.repository.model.SearchMyRepositoryEntryViewParams.Filter;
+import org.olat.repository.model.SearchMyRepositoryEntryViewParams.OrderBy;
 import org.olat.repository.ui.PriceMethod;
 import org.olat.resource.OLATResource;
 import org.olat.resource.accesscontrol.ACService;
diff --git a/src/main/java/org/olat/repository/ui/list/OverviewRepositoryListController.java b/src/main/java/org/olat/repository/ui/list/OverviewRepositoryListController.java
index f3bc89911a01c9f518e6d8b7a10ebaa7c022e395..e1e2cac0bb737008ea5636a83806060106c381de 100644
--- a/src/main/java/org/olat/repository/ui/list/OverviewRepositoryListController.java
+++ b/src/main/java/org/olat/repository/ui/list/OverviewRepositoryListController.java
@@ -23,7 +23,6 @@ import java.util.List;
 
 import org.olat.catalog.CatalogEntry;
 import org.olat.catalog.CatalogManager;
-import org.olat.core.CoreSpringFactory;
 import org.olat.core.gui.UserRequest;
 import org.olat.core.gui.components.Component;
 import org.olat.core.gui.components.link.Link;
@@ -47,8 +46,9 @@ import org.olat.core.util.Util;
 import org.olat.core.util.resource.OresHelper;
 import org.olat.repository.RepositoryManager;
 import org.olat.repository.RepositoryModule;
-import org.olat.repository.SearchMyRepositoryEntryViewParams;
+import org.olat.repository.model.SearchMyRepositoryEntryViewParams;
 import org.olat.util.logging.activity.LoggingResourceable;
+import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * 
@@ -71,15 +71,14 @@ public class OverviewRepositoryListController extends BasicController implements
 	private CatalogNodeController catalogCtrl;
 	private BreadcrumbedStackedPanel catalogStackPanel;
 	
-	private final CatalogManager catalogManager;
-	private final RepositoryModule repositoryModule;
+	@Autowired
+	private CatalogManager catalogManager;
+	@Autowired
+	private RepositoryModule repositoryModule;
 	
 	public OverviewRepositoryListController(UserRequest ureq, WindowControl wControl) {
 		super(ureq, wControl);
 		setTranslator(Util.createPackageTranslator(RepositoryManager.class, getLocale(), getTranslator()));
-		
-		catalogManager = CoreSpringFactory.getImpl(CatalogManager.class);
-		repositoryModule = CoreSpringFactory.getImpl(RepositoryModule.class);
 
 		mainPanel = new MainPanel("myCoursesMainPanel");
 		mainPanel.setDomReplaceable(false);
diff --git a/src/main/java/org/olat/repository/ui/list/RepositoryEntryDetailsController.java b/src/main/java/org/olat/repository/ui/list/RepositoryEntryDetailsController.java
index c62cda6cfd7bf9e9a986ca835a93b96e3a76f195..ed9b697e6ba6476f59df91e9ce32eb6da69eba62 100644
--- a/src/main/java/org/olat/repository/ui/list/RepositoryEntryDetailsController.java
+++ b/src/main/java/org/olat/repository/ui/list/RepositoryEntryDetailsController.java
@@ -26,7 +26,6 @@ import java.util.List;
 import org.olat.NewControllerFactory;
 import org.olat.catalog.CatalogEntry;
 import org.olat.catalog.CatalogManager;
-import org.olat.core.CoreSpringFactory;
 import org.olat.core.commons.services.commentAndRating.CommentAndRatingDefaultSecurityCallback;
 import org.olat.core.commons.services.commentAndRating.CommentAndRatingSecurityCallback;
 import org.olat.core.commons.services.commentAndRating.manager.UserRatingsDAO;
@@ -67,16 +66,17 @@ import org.olat.group.BusinessGroupService;
 import org.olat.group.model.SearchBusinessGroupParams;
 import org.olat.repository.RepositoryEntry;
 import org.olat.repository.RepositoryService;
-import org.olat.repository.RepositoyUIFactory;
 import org.olat.repository.handlers.RepositoryHandler;
 import org.olat.repository.handlers.RepositoryHandlerFactory;
 import org.olat.repository.ui.PriceMethod;
+import org.olat.repository.ui.RepositoyUIFactory;
 import org.olat.resource.accesscontrol.ACService;
 import org.olat.resource.accesscontrol.AccessResult;
 import org.olat.resource.accesscontrol.model.AccessMethod;
 import org.olat.resource.accesscontrol.model.OfferAccess;
 import org.olat.resource.accesscontrol.model.Price;
 import org.olat.resource.accesscontrol.ui.PriceFormat;
+import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * 
@@ -95,31 +95,29 @@ public class RepositoryEntryDetailsController extends FormBasicController {
 	private final RepositoryEntry entry;
 	private final RepositoryEntryRow row;
 
-	private final UserRatingsDAO userRatingsDao;
-	private final ACService acService;
-	private final MarkManager markManager;
-	private final CatalogManager catalogManager;
-	private final RepositoryService repositoryService;
-	private final BusinessGroupService businessGroupService;
-	private final EfficiencyStatementManager effManager;
-	private final UserCourseInformationsManager userCourseInfosManager;
+	@Autowired
+	private UserRatingsDAO userRatingsDao;
+	@Autowired
+	private ACService acService;
+	@Autowired
+	private MarkManager markManager;
+	@Autowired
+	private CatalogManager catalogManager;
+	@Autowired
+	private RepositoryService repositoryService;
+	@Autowired
+	private BusinessGroupService businessGroupService;
+	@Autowired
+	private EfficiencyStatementManager effManager;
+	@Autowired
+	private UserCourseInformationsManager userCourseInfosManager;
 	
 	private String baseUrl;
 	
 	public RepositoryEntryDetailsController(UserRequest ureq, WindowControl wControl, RepositoryEntryRow row) {
 		super(ureq, wControl, "details");
-		
 		setTranslator(Util.createPackageTranslator(RepositoryService.class, getLocale(), getTranslator()));
 
-		acService = CoreSpringFactory.getImpl(ACService.class);
-		markManager = CoreSpringFactory.getImpl(MarkManager.class);
-		catalogManager = CoreSpringFactory.getImpl(CatalogManager.class);
-		userRatingsDao = CoreSpringFactory.getImpl(UserRatingsDAO.class);
-		repositoryService = CoreSpringFactory.getImpl(RepositoryService.class);
-		effManager = CoreSpringFactory.getImpl(EfficiencyStatementManager.class);
-		businessGroupService = CoreSpringFactory.getImpl(BusinessGroupService.class);
-		userCourseInfosManager = CoreSpringFactory.getImpl(UserCourseInformationsManager.class);
-		
 		this.row = row;
 		entry = repositoryService.loadByKey(row.getKey());
 		
diff --git a/src/main/java/org/olat/repository/ui/list/RepositoryEntryListController.java b/src/main/java/org/olat/repository/ui/list/RepositoryEntryListController.java
index 5948d4b1a532fc2b598ad7db6a16f8e0c49b962b..0e641903637dfd29737b450404d98d2006cafde6 100644
--- a/src/main/java/org/olat/repository/ui/list/RepositoryEntryListController.java
+++ b/src/main/java/org/olat/repository/ui/list/RepositoryEntryListController.java
@@ -23,7 +23,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.olat.NewControllerFactory;
-import org.olat.core.CoreSpringFactory;
 import org.olat.core.commons.services.commentAndRating.CommentAndRatingDefaultSecurityCallback;
 import org.olat.core.commons.services.commentAndRating.CommentAndRatingSecurityCallback;
 import org.olat.core.commons.services.commentAndRating.manager.UserRatingsDAO;
@@ -62,11 +61,12 @@ import org.olat.core.util.StringHelper;
 import org.olat.core.util.Util;
 import org.olat.core.util.resource.OresHelper;
 import org.olat.repository.RepositoryManager;
-import org.olat.repository.SearchMyRepositoryEntryViewParams;
-import org.olat.repository.SearchMyRepositoryEntryViewParams.Filter;
-import org.olat.repository.SearchMyRepositoryEntryViewParams.OrderBy;
+import org.olat.repository.model.SearchMyRepositoryEntryViewParams;
+import org.olat.repository.model.SearchMyRepositoryEntryViewParams.Filter;
+import org.olat.repository.model.SearchMyRepositoryEntryViewParams.OrderBy;
 import org.olat.repository.ui.RepositoryEntryImageMapper;
 import org.olat.repository.ui.list.RepositoryEntryDataModel.Cols;
+import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * 
@@ -88,15 +88,15 @@ public class RepositoryEntryListController extends FormBasicController
 	private RepositoryEntryDetailsController detailsCtrl;
 	
 	private final String mapperThumbnailUrl;
-	private final MarkManager markManager;
-	private final UserRatingsDAO userRatingsDao;
+	@Autowired
+	private MarkManager markManager;
+	@Autowired
+	private UserRatingsDAO userRatingsDao;
 	
 	public RepositoryEntryListController(UserRequest ureq, WindowControl wControl,
 			SearchMyRepositoryEntryViewParams searchParams, BreadcrumbPanel stackPanel) {
 		super(ureq, wControl, "repoentry_table");
 		setTranslator(Util.createPackageTranslator(RepositoryManager.class, getLocale(), getTranslator()));
-		markManager = CoreSpringFactory.getImpl(MarkManager.class);
-		userRatingsDao = CoreSpringFactory.getImpl(UserRatingsDAO.class);
 		mapperThumbnailUrl = registerCacheableMapper(ureq, "repositoryentryImage", new RepositoryEntryImageMapper());
 		
 		this.stackPanel = stackPanel;
@@ -162,7 +162,7 @@ public class RepositoryEntryListController extends FormBasicController
 		columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(Cols.comments.i18nKey(), Cols.comments.ordinal()));
 
 		model = new RepositoryEntryDataModel(dataSource, columnsModel);
-		tableEl = uifactory.addTableElement(ureq, getWindowControl(), "table", model, 20, getTranslator(), formLayout);
+		tableEl = uifactory.addTableElement(ureq, getWindowControl(), "table", model, 20, true, getTranslator(), formLayout);
 		tableEl.setRendererType(FlexiTableRendererType.custom);
 		tableEl.setAvailableRendererTypes(FlexiTableRendererType.custom, FlexiTableRendererType.classic);
 		tableEl.setSearchEnabled(true);
diff --git a/src/main/java/org/olat/restapi/repository/RepositoryEntriesResource.java b/src/main/java/org/olat/restapi/repository/RepositoryEntriesResource.java
index 64191a5cd39f32cda540dc7543da09bd854b1980..35b41e2f156c55296a599bf06d53e43dccbb4b0f 100644
--- a/src/main/java/org/olat/restapi/repository/RepositoryEntriesResource.java
+++ b/src/main/java/org/olat/restapi/repository/RepositoryEntriesResource.java
@@ -66,7 +66,7 @@ import org.olat.fileresource.types.FileResource;
 import org.olat.repository.RepositoryEntry;
 import org.olat.repository.RepositoryManager;
 import org.olat.repository.RepositoryService;
-import org.olat.repository.SearchRepositoryEntryParameters;
+import org.olat.repository.model.SearchRepositoryEntryParameters;
 import org.olat.resource.OLATResource;
 import org.olat.resource.OLATResourceManager;
 import org.olat.restapi.security.RestSecurityHelper;
diff --git a/src/main/java/org/olat/restapi/repository/course/CoursesInfosWebService.java b/src/main/java/org/olat/restapi/repository/course/CoursesInfosWebService.java
index 7311522af1a82e3f1cc2cb2d408ca08505211e78..2d2c565d8d8d4a88cadaaf3031a6e401b4d2cd5c 100644
--- a/src/main/java/org/olat/restapi/repository/course/CoursesInfosWebService.java
+++ b/src/main/java/org/olat/restapi/repository/course/CoursesInfosWebService.java
@@ -63,7 +63,7 @@ import org.olat.modules.fo.restapi.ForumCourseNodeWebService;
 import org.olat.modules.fo.restapi.ForumVO;
 import org.olat.repository.RepositoryEntry;
 import org.olat.repository.RepositoryManager;
-import org.olat.repository.SearchRepositoryEntryParameters;
+import org.olat.repository.model.SearchRepositoryEntryParameters;
 import org.olat.resource.accesscontrol.ACService;
 import org.olat.resource.accesscontrol.AccessResult;
 import org.olat.restapi.support.MediaTypeVariants;
diff --git a/src/main/java/org/olat/restapi/repository/course/CoursesWebService.java b/src/main/java/org/olat/restapi/repository/course/CoursesWebService.java
index 00bceac1a6ccc346459f8ac610e084753ca2fee3..ba451cce91aa33f9646631d4d320ccc76a512588 100644
--- a/src/main/java/org/olat/restapi/repository/course/CoursesWebService.java
+++ b/src/main/java/org/olat/restapi/repository/course/CoursesWebService.java
@@ -68,9 +68,9 @@ import org.olat.course.tree.CourseEditorTreeNode;
 import org.olat.repository.RepositoryEntry;
 import org.olat.repository.RepositoryManager;
 import org.olat.repository.RepositoryService;
-import org.olat.repository.SearchRepositoryEntryParameters;
 import org.olat.repository.handlers.RepositoryHandler;
 import org.olat.repository.handlers.RepositoryHandlerFactory;
+import org.olat.repository.model.SearchRepositoryEntryParameters;
 import org.olat.resource.OLATResource;
 import org.olat.resource.OLATResourceManager;
 import org.olat.resource.accesscontrol.ACService;
diff --git a/src/main/java/org/olat/search/service/indexer/repository/RepositoryIndexer.java b/src/main/java/org/olat/search/service/indexer/repository/RepositoryIndexer.java
index c55712a5a7fa51b32415fc09234c2bd840676855..02515759e2b6e1eb00bf53d4e456089d674a33e3 100644
--- a/src/main/java/org/olat/search/service/indexer/repository/RepositoryIndexer.java
+++ b/src/main/java/org/olat/search/service/indexer/repository/RepositoryIndexer.java
@@ -40,7 +40,7 @@ import org.olat.core.logging.AssertException;
 import org.olat.core.util.resource.OresHelper;
 import org.olat.repository.RepositoryEntry;
 import org.olat.repository.RepositoryManager;
-import org.olat.repository.SearchRepositoryEntryParameters;
+import org.olat.repository.model.SearchRepositoryEntryParameters;
 import org.olat.search.SearchModule;
 import org.olat.search.service.SearchResourceContext;
 import org.olat.search.service.document.RepositoryEntryDocument;
diff --git a/src/main/java/org/olat/upgrade/OLATUpgrade_8_2_0.java b/src/main/java/org/olat/upgrade/OLATUpgrade_8_2_0.java
index 9eb4fb2e15d347a5c55264abd52d729658e39722..34d92370ec84556c9976b40ccb76a3d9d8d4a303 100644
--- a/src/main/java/org/olat/upgrade/OLATUpgrade_8_2_0.java
+++ b/src/main/java/org/olat/upgrade/OLATUpgrade_8_2_0.java
@@ -42,7 +42,7 @@ import org.olat.group.model.BGAreaReference;
 import org.olat.group.model.BusinessGroupReference;
 import org.olat.repository.RepositoryEntry;
 import org.olat.repository.RepositoryManager;
-import org.olat.repository.SearchRepositoryEntryParameters;
+import org.olat.repository.model.SearchRepositoryEntryParameters;
 import org.olat.resource.OLATResource;
 import org.olat.resource.OLATResourceManager;
 import org.olat.upgrade.model.BGAreaUpgrade;
diff --git a/src/test/java/org/olat/course/assessment/manager/EfficiencyStatementManagerTest.java b/src/test/java/org/olat/course/assessment/manager/EfficiencyStatementManagerTest.java
index 28f521340c5580db11a13b52f6f39038276e1394..f9bf07ed08afe0e16ac1b802c203a3bac3ba830e 100644
--- a/src/test/java/org/olat/course/assessment/manager/EfficiencyStatementManagerTest.java
+++ b/src/test/java/org/olat/course/assessment/manager/EfficiencyStatementManagerTest.java
@@ -36,7 +36,7 @@ import org.olat.course.assessment.EfficiencyStatementManager;
 import org.olat.course.config.CourseConfig;
 import org.olat.repository.RepositoryEntry;
 import org.olat.repository.RepositoryManager;
-import org.olat.repository.SearchRepositoryEntryParameters;
+import org.olat.repository.model.SearchRepositoryEntryParameters;
 import org.olat.test.OlatTestCase;
 import org.springframework.beans.factory.annotation.Autowired;
 
diff --git a/src/test/java/org/olat/repository/RepositoryManagerQueryTest.java b/src/test/java/org/olat/repository/RepositoryManagerQueryTest.java
index 3e616e2b57af2a96ea5598712e3c536c43736bfe..5a9a8d6a742487d1156e1012e7f2843a0c9d34d2 100644
--- a/src/test/java/org/olat/repository/RepositoryManagerQueryTest.java
+++ b/src/test/java/org/olat/repository/RepositoryManagerQueryTest.java
@@ -35,6 +35,7 @@ import org.olat.core.commons.persistence.DBFactory;
 import org.olat.core.id.Identity;
 import org.olat.core.id.Roles;
 import org.olat.core.id.UserConstants;
+import org.olat.repository.model.SearchRepositoryEntryParameters;
 import org.olat.resource.OLATResource;
 import org.olat.resource.OLATResourceManager;
 import org.olat.test.JunitTestHelper;
diff --git a/src/test/java/org/olat/repository/RepositoryManagerTest.java b/src/test/java/org/olat/repository/RepositoryManagerTest.java
index 18c7c1ed70700b2944aca8b046c4857716af45c4..162715a85c874b69c3ef95f5e96a96e9cc24e296 100644
--- a/src/test/java/org/olat/repository/RepositoryManagerTest.java
+++ b/src/test/java/org/olat/repository/RepositoryManagerTest.java
@@ -64,6 +64,7 @@ import org.olat.repository.manager.RepositoryEntryLifecycleDAO;
 import org.olat.repository.manager.RepositoryEntryRelationDAO;
 import org.olat.repository.model.RepositoryEntryLifecycle;
 import org.olat.repository.model.RepositoryEntryMembership;
+import org.olat.repository.model.SearchRepositoryEntryParameters;
 import org.olat.resource.OLATResource;
 import org.olat.resource.OLATResourceManager;
 import org.olat.test.JMSCodePointServerJunitHelper;
diff --git a/src/test/java/org/olat/restapi/CourseTest.java b/src/test/java/org/olat/restapi/CourseTest.java
index 8417fbac609e4144f9dd7963bcef514915a5a927..e13961fe11f888e8be91d68bd0334308e73af222 100644
--- a/src/test/java/org/olat/restapi/CourseTest.java
+++ b/src/test/java/org/olat/restapi/CourseTest.java
@@ -72,7 +72,7 @@ import org.olat.course.ICourse;
 import org.olat.repository.RepositoryEntry;
 import org.olat.repository.RepositoryManager;
 import org.olat.repository.RepositoryService;
-import org.olat.repository.SearchRepositoryEntryParameters;
+import org.olat.repository.model.SearchRepositoryEntryParameters;
 import org.olat.restapi.repository.course.CoursesWebService;
 import org.olat.restapi.support.vo.CourseVO;
 import org.olat.restapi.support.vo.RepositoryEntryVO;