diff --git a/src/main/java/org/olat/core/dispatcher/jumpin/JumpInManager.java b/src/main/java/org/olat/core/dispatcher/jumpin/JumpInManager.java
index 1e6df2d289249774d424a496e04b75f6b3d2b096..6920cd60a5cfe3fffb83a602606ba32e44e9c609 100644
--- a/src/main/java/org/olat/core/dispatcher/jumpin/JumpInManager.java
+++ b/src/main/java/org/olat/core/dispatcher/jumpin/JumpInManager.java
@@ -26,22 +26,19 @@
 
 package org.olat.core.dispatcher.jumpin;
 
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.olat.core.CoreSpringFactory;
-import org.olat.core.commons.servlets.util.URLEncoder;
 import org.olat.core.dispatcher.DispatcherAction;
 import org.olat.core.gui.UserRequest;
 import org.olat.core.helpers.Settings;
 import org.olat.core.id.context.BusinessControl;
 import org.olat.core.id.context.ContextEntry;
 import org.olat.core.id.context.StackedBusinessControl;
-import org.olat.core.logging.Tracing;
 import org.olat.core.manager.BasicManager;
+import org.olat.core.util.servlets.URLEncoder;
 
 /**
  * Description: <br>
diff --git a/src/main/java/org/olat/core/id/context/BusinessControlFactory.java b/src/main/java/org/olat/core/id/context/BusinessControlFactory.java
index 553ba9188bdd2d431f5e70e0d53a54f10527ab14..c942b2c572ad27b472cb1fa36dd5af611dce6aa2 100644
--- a/src/main/java/org/olat/core/id/context/BusinessControlFactory.java
+++ b/src/main/java/org/olat/core/id/context/BusinessControlFactory.java
@@ -36,7 +36,6 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.olat.core.commons.servlets.util.URLEncoder;
 import org.olat.core.gui.UserRequest;
 import org.olat.core.gui.control.WindowControl;
 import org.olat.core.helpers.Settings;
@@ -45,6 +44,7 @@ import org.olat.core.id.OLATResourceable;
 import org.olat.core.logging.AssertException;
 import org.olat.core.logging.Tracing;
 import org.olat.core.util.resource.OresHelper;
+import org.olat.core.util.servlets.URLEncoder;
 
 
 /**
diff --git a/src/main/java/org/olat/core/servlets/DefaultServlet.java b/src/main/java/org/olat/core/servlets/DefaultServlet.java
index 42033c8283a38c45066369f5ed684440a8180c9b..0faaa4a358d0c52c6c003b6d267612a6171f042d 100644
--- a/src/main/java/org/olat/core/servlets/DefaultServlet.java
+++ b/src/main/java/org/olat/core/servlets/DefaultServlet.java
@@ -124,12 +124,11 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.naming.resources.Resource;
 import org.apache.naming.resources.ResourceAttributes;
-import org.olat.core.commons.servlets.util.URLEncoder;
 import org.olat.core.helpers.Settings;
 import org.olat.core.util.servlets.FastHttpDateFormat;
 import org.olat.core.util.servlets.Globals;
 import org.olat.core.util.servlets.MD5Encoder;
-import org.olat.core.util.servlets.ServerInfo;
+import org.olat.core.util.servlets.URLEncoder;
 
 
 /**
diff --git a/src/main/java/org/olat/core/util/controller/OLATResourceableListeningWrapperController.java b/src/main/java/org/olat/core/util/controller/OLATResourceableListeningWrapperController.java
index ece7e841b6867e876f00439974c7e5b45c39a26d..9a4da63e9bdca64ff5863084c2233671124ff919 100644
--- a/src/main/java/org/olat/core/util/controller/OLATResourceableListeningWrapperController.java
+++ b/src/main/java/org/olat/core/util/controller/OLATResourceableListeningWrapperController.java
@@ -29,7 +29,6 @@ package org.olat.core.util.controller;
 import java.util.Iterator;
 import java.util.List;
 
-import org.olat.core.commons.fullWebApp.LayoutMain3ColsController;
 import org.olat.core.gui.UserRequest;
 import org.olat.core.gui.components.Component;
 import org.olat.core.gui.control.Controller;
diff --git a/src/main/java/org/olat/util/locks/DBPersistentLockManager.java b/src/main/java/org/olat/core/util/coordinate/DBPersistentLockManager.java
similarity index 93%
rename from src/main/java/org/olat/util/locks/DBPersistentLockManager.java
rename to src/main/java/org/olat/core/util/coordinate/DBPersistentLockManager.java
index 15e1f950bc1bcac81b8a9408c381a4d5c10f508c..dfb29bc1d5afe01a0c60406a379782154560b119 100644
--- a/src/main/java/org/olat/util/locks/DBPersistentLockManager.java
+++ b/src/main/java/org/olat/core/util/coordinate/DBPersistentLockManager.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.util.locks;
+package org.olat.core.util.coordinate;
 
 import org.hibernate.Hibernate;
 import org.hibernate.type.Type;
@@ -32,12 +32,7 @@ import org.olat.core.commons.persistence.DBFactory;
 import org.olat.core.id.Identity;
 import org.olat.core.id.OLATResourceable;
 import org.olat.core.logging.AssertException;
-import org.olat.core.logging.Tracing;
 import org.olat.core.manager.BasicManager;
-import org.olat.core.util.coordinate.LockEntry;
-import org.olat.core.util.coordinate.LockResult;
-import org.olat.core.util.coordinate.LockResultImpl;
-import org.olat.core.util.coordinate.PersistentLockManager;
 import org.olat.core.util.resource.OresHelper;
 import org.olat.properties.Property;
 import org.olat.properties.PropertyManager;
@@ -134,7 +129,7 @@ public class DBPersistentLockManager extends BasicManager implements PersistentL
 		String query = "from v in class org.olat.properties.Property where v.category = ? and v.longValue = ?";
 		DBFactory.getInstance().delete(query, new Object[] { CATEGORY_PERSISTENTLOCK, identity.getKey() },
 				new Type[] { Hibernate.STRING, Hibernate.LONG });
-		Tracing.logDebug("All db-persisting-locks deleted for identity=" + identity, this.getClass());
+		logDebug("All db-persisting-locks deleted for identity=" + identity);
 	}
 
 }
diff --git a/src/main/java/org/olat/core/commons/servlets/util/URLEncoder.java b/src/main/java/org/olat/core/util/servlets/URLEncoder.java
similarity index 99%
rename from src/main/java/org/olat/core/commons/servlets/util/URLEncoder.java
rename to src/main/java/org/olat/core/util/servlets/URLEncoder.java
index e12ad2de76088449cfa6379b5be8156d322325f5..86648f9e885c4eef14ee1c1c693c6d5cf6c18443 100644
--- a/src/main/java/org/olat/core/commons/servlets/util/URLEncoder.java
+++ b/src/main/java/org/olat/core/util/servlets/URLEncoder.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.core.commons.servlets.util;
+package org.olat.core.util.servlets;
 
 /*
  * ====================================================================
diff --git a/src/main/java/org/olat/course/nodes/ta/DropboxScoringViewController.java b/src/main/java/org/olat/course/nodes/ta/DropboxScoringViewController.java
index e4fa5f0b3d3b86354c8196ab0c47f323a7b53ef5..258c73bd4bcb2228bbabe40a9972fcdbbbe1dfaf 100644
--- a/src/main/java/org/olat/course/nodes/ta/DropboxScoringViewController.java
+++ b/src/main/java/org/olat/course/nodes/ta/DropboxScoringViewController.java
@@ -36,7 +36,6 @@ import org.olat.core.commons.modules.bc.FolderEvent;
 import org.olat.core.commons.modules.bc.FolderRunController;
 import org.olat.core.commons.modules.bc.vfs.OlatNamedContainerImpl;
 import org.olat.core.commons.modules.bc.vfs.OlatRootFolderImpl;
-import org.olat.core.commons.servlets.util.URLEncoder;
 import org.olat.core.dispatcher.jumpin.JumpInManager;
 import org.olat.core.gui.UserRequest;
 import org.olat.core.gui.components.Component;
@@ -65,6 +64,7 @@ import org.olat.core.util.mail.MailerResult;
 import org.olat.core.util.mail.MailerWithTemplate;
 import org.olat.core.util.notifications.SubscriptionContext;
 import org.olat.core.util.resource.OresHelper;
+import org.olat.core.util.servlets.URLEncoder;
 import org.olat.core.util.vfs.LocalFolderImpl;
 import org.olat.core.util.vfs.Quota;
 import org.olat.core.util.vfs.QuotaManager;
diff --git a/src/main/resources/serviceconfig/org/olat/_spring/olatextconfig.xml b/src/main/resources/serviceconfig/org/olat/_spring/olatextconfig.xml
index 105e0823dcdbded117d5b2a7a1a0d76e242fd853..08bb0d7ea2007a75fe2a0a5e79dc5e42d6dd50be 100644
--- a/src/main/resources/serviceconfig/org/olat/_spring/olatextconfig.xml
+++ b/src/main/resources/serviceconfig/org/olat/_spring/olatextconfig.xml
@@ -42,7 +42,7 @@
 		*** Define the persistent lock manager    ***
 		*****************************************
 	-->
-	<bean id="persistentLockManager" class="org.olat.util.locks.DBPersistentLockManager"  >
+	<bean id="persistentLockManager" class="org.olat.core.util.coordinate.DBPersistentLockManager"  >
 		<constructor-arg index="0" ref="userDeletionManager" />
 	</bean>