diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index b8a9021d0..0e8835a15 100644
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -11,6 +11,7 @@ use Friendica\Database\DBM;
 use Friendica\Model\Process;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
+use Friendica\Util\Lock;
 use dba;
 
 require_once 'include/dba.php';
diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index 69975c575..a1223b7b6 100644
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -19,6 +19,7 @@ use Friendica\Model\User;
 use Friendica\Network\Probe;
 use Friendica\Object\Image;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Lock;
 use Friendica\Util\Network;
 use Friendica\Util\XML;
 use dba;
diff --git a/src/Core/Lock.php b/src/Util/Lock.php
similarity index 96%
rename from src/Core/Lock.php
rename to src/Util/Lock.php
index 9e02d14fc..95341b4b6 100644
--- a/src/Core/Lock.php
+++ b/src/Util/Lock.php
@@ -10,7 +10,7 @@ namespace Friendica\Util;
  */
 
 use Friendica\Core\Config;
-use Friendica\Core\Lock;
+use Friendica\Util\Lock;
 
 require_once 'include/dba.php';
 
@@ -94,4 +94,9 @@ class Lock
 	{
 		self::getDriver()->releaseAll();
 	}
+
+	public static function isLocked($key)
+	{
+
+	}
 }
diff --git a/src/Core/Lock/DatabaseLockDriver.php b/src/Util/Lock/DatabaseLockDriver.php
similarity index 98%
rename from src/Core/Lock/DatabaseLockDriver.php
rename to src/Util/Lock/DatabaseLockDriver.php
index 8761a1479..b2e8f5027 100644
--- a/src/Core/Lock/DatabaseLockDriver.php
+++ b/src/Util/Lock/DatabaseLockDriver.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Core\Lock;
+namespace Friendica\Util\Lock;
 
 use dba;
 use Friendica\Database\DBM;
diff --git a/src/Core/Lock/ILockDriver.php b/src/Util/Lock/ILockDriver.php
similarity index 91%
rename from src/Core/Lock/ILockDriver.php
rename to src/Util/Lock/ILockDriver.php
index b066361be..6b8a08cb0 100644
--- a/src/Core/Lock/ILockDriver.php
+++ b/src/Util/Lock/ILockDriver.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Core\Lock;
+namespace Friendica\Util\Lock;
 
 /**
  * Lock Driver Interface
@@ -35,4 +35,7 @@ interface ILockDriver
 	 * @return void
 	 */
 	public function releaseAll();
+
+
+	public function isLocked();
 }
\ No newline at end of file
diff --git a/src/Core/Lock/MemcacheLockDriver.php b/src/Util/Lock/MemcacheLockDriver.php
similarity index 98%
rename from src/Core/Lock/MemcacheLockDriver.php
rename to src/Util/Lock/MemcacheLockDriver.php
index 1796d8136..9a3ceb464 100644
--- a/src/Core/Lock/MemcacheLockDriver.php
+++ b/src/Util/Lock/MemcacheLockDriver.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Core\Lock;
+namespace Friendica\Util\Lock;
 
 use Friendica\Core\Cache;
 use dba;
diff --git a/src/Core/Lock/SemaphoreLockDriver.php b/src/Util/Lock/SemaphoreLockDriver.php
similarity index 98%
rename from src/Core/Lock/SemaphoreLockDriver.php
rename to src/Util/Lock/SemaphoreLockDriver.php
index 93911a3d1..3adf1ff37 100644
--- a/src/Core/Lock/SemaphoreLockDriver.php
+++ b/src/Util/Lock/SemaphoreLockDriver.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Friendica\Core\Lock;
+namespace Friendica\Util\Lock;
 
 class SemaphoreLockDriver implements ILockDriver
 {