diff --git a/src/Core/Lock/Type.php b/src/Core/Lock/Enum/Type.php
similarity index 96%
rename from src/Core/Lock/Type.php
rename to src/Core/Lock/Enum/Type.php
index 769bad12e..1ad1ef78e 100644
--- a/src/Core/Lock/Type.php
+++ b/src/Core/Lock/Enum/Type.php
@@ -19,7 +19,7 @@
  *
  */
 
-namespace Friendica\Core\Lock;
+namespace Friendica\Core\Lock\Enum;
 
 use Friendica\Core\Cache\Enum\Type as CacheType;
 
diff --git a/src/Factory/LockFactory.php b/src/Core/Lock/Factory/LockFactory.php
similarity index 92%
rename from src/Factory/LockFactory.php
rename to src/Core/Lock/Factory/LockFactory.php
index 2a54910d4..124ed2f08 100644
--- a/src/Factory/LockFactory.php
+++ b/src/Core/Lock/Factory/LockFactory.php
@@ -19,7 +19,7 @@
  *
  */
 
-namespace Friendica\Factory;
+namespace Friendica\Core\Lock\Factory;
 
 use Friendica\Core\Cache\Factory\CacheFactory;
 use Friendica\Core\Cache\IMemoryCache;
@@ -83,18 +83,18 @@ class LockFactory
 				case Type::APCU:
 					$cache = $this->cacheFactory->create($lock_type);
 					if ($cache instanceof IMemoryCache) {
-						return new Lock\CacheLock($cache);
+						return new Lock\Type\CacheLock($cache);
 					} else {
 						throw new \Exception(sprintf('Incompatible cache driver \'%s\' for lock used', $lock_type));
 					}
 					break;
 
 				case 'database':
-					return new Lock\DatabaseLock($this->dba);
+					return new Lock\Type\DatabaseLock($this->dba);
 					break;
 
 				case 'semaphore':
-					return new Lock\SemaphoreLock();
+					return new Lock\Type\SemaphoreLock();
 					break;
 
 				default:
@@ -121,7 +121,7 @@ class LockFactory
 		// 1. Try to use Semaphores for - local - locking
 		if (function_exists('sem_get')) {
 			try {
-				return new Lock\SemaphoreLock();
+				return new Lock\Type\SemaphoreLock();
 			} catch (\Exception $exception) {
 				$this->logger->warning('Using Semaphore driver for locking failed.', ['exception' => $exception]);
 			}
@@ -133,7 +133,7 @@ class LockFactory
 			try {
 				$cache = $this->cacheFactory->create($cache_type);
 				if ($cache instanceof IMemoryCache) {
-					return new Lock\CacheLock($cache);
+					return new Lock\Type\CacheLock($cache);
 				}
 			} catch (\Exception $exception) {
 				$this->logger->warning('Using Cache driver for locking failed.', ['exception' => $exception]);
@@ -141,6 +141,6 @@ class LockFactory
 		}
 
 		// 3. Use Database Locking as a Fallback
-		return new Lock\DatabaseLock($this->dba);
+		return new Lock\Type\DatabaseLock($this->dba);
 	}
 }
diff --git a/src/Core/BaseLock.php b/src/Core/Lock/Type/BaseLock.php
similarity index 98%
rename from src/Core/BaseLock.php
rename to src/Core/Lock/Type/BaseLock.php
index 474fe98ea..518475b44 100644
--- a/src/Core/BaseLock.php
+++ b/src/Core/Lock/Type/BaseLock.php
@@ -19,7 +19,7 @@
  *
  */
 
-namespace Friendica\Core;
+namespace Friendica\Core\Lock\Type;
 
 use Friendica\Core\Lock\ILock;
 
diff --git a/src/Core/Lock/CacheLock.php b/src/Core/Lock/Type/CacheLock.php
similarity index 98%
rename from src/Core/Lock/CacheLock.php
rename to src/Core/Lock/Type/CacheLock.php
index 20705e06e..8a85f0765 100644
--- a/src/Core/Lock/CacheLock.php
+++ b/src/Core/Lock/Type/CacheLock.php
@@ -19,9 +19,8 @@
  *
  */
 
-namespace Friendica\Core\Lock;
+namespace Friendica\Core\Lock\Type;
 
-use Friendica\Core\BaseLock;
 use Friendica\Core\Cache\Enum\Duration;
 use Friendica\Core\Cache\IMemoryCache;
 
diff --git a/src/Core/Lock/DatabaseLock.php b/src/Core/Lock/Type/DatabaseLock.php
similarity index 98%
rename from src/Core/Lock/DatabaseLock.php
rename to src/Core/Lock/Type/DatabaseLock.php
index 14e78f625..de44e2e2b 100644
--- a/src/Core/Lock/DatabaseLock.php
+++ b/src/Core/Lock/Type/DatabaseLock.php
@@ -19,10 +19,10 @@
  *
  */
 
-namespace Friendica\Core\Lock;
+namespace Friendica\Core\Lock\Type;
 
-use Friendica\Core\BaseLock;
 use Friendica\Core\Cache\Enum\Duration;
+use Friendica\Core\Lock\Enum\Type;
 use Friendica\Database\Database;
 use Friendica\Util\DateTimeFormat;
 
diff --git a/src/Core/Lock/SemaphoreLock.php b/src/Core/Lock/Type/SemaphoreLock.php
similarity index 96%
rename from src/Core/Lock/SemaphoreLock.php
rename to src/Core/Lock/Type/SemaphoreLock.php
index fa5cf5e87..4393e4515 100644
--- a/src/Core/Lock/SemaphoreLock.php
+++ b/src/Core/Lock/Type/SemaphoreLock.php
@@ -19,10 +19,11 @@
  *
  */
 
-namespace Friendica\Core\Lock;
+namespace Friendica\Core\Lock\Type;
 
-use Friendica\Core\BaseLock;
 use Friendica\Core\Cache\Enum\Duration;
+use Friendica\Core\Lock\Enum\Type;
+use function get_temppath;
 
 class SemaphoreLock extends BaseLock
 {
diff --git a/static/dependencies.config.php b/static/dependencies.config.php
index fe063c046..48ed997f3 100644
--- a/static/dependencies.config.php
+++ b/static/dependencies.config.php
@@ -39,7 +39,7 @@ use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\L10n;
-use Friendica\Core\Lock\ILock;
+use Friendica\Core\Lock;
 use Friendica\Core\Process;
 use Friendica\Core\Session\ISession;
 use Friendica\Core\StorageManager;
@@ -101,7 +101,7 @@ return [
 			['create', [], Dice::CHAIN_CALL],
 		],
 	],
-	\Friendica\Core\PConfig\IPConfig::class => [
+	PConfig\IPConfig::class => [
 		'instanceOf' => PConfig\Factory\PConfigFactory::class,
 		'call'       => [
 			['create', [], Dice::CHAIN_CALL],
@@ -170,8 +170,8 @@ return [
 			['create', [], Dice::CHAIN_CALL],
 		],
 	],
-	ILock::class                    => [
-		'instanceOf' => Factory\LockFactory::class,
+	Lock\ILock::class                    => [
+		'instanceOf' => Lock\Factory\LockFactory::class,
 		'call'       => [
 			['create', [], Dice::CHAIN_CALL],
 		],
diff --git a/tests/src/Core/Lock/APCuCacheLockTest.php b/tests/src/Core/Lock/APCuCacheLockTest.php
index 750748975..3f13000e0 100644
--- a/tests/src/Core/Lock/APCuCacheLockTest.php
+++ b/tests/src/Core/Lock/APCuCacheLockTest.php
@@ -22,7 +22,7 @@
 namespace Friendica\Test\src\Core\Lock;
 
 use Friendica\Core\Cache\Type\APCuCache;
-use Friendica\Core\Lock\CacheLock;
+use Friendica\Core\Lock\Type\CacheLock;
 
 /**
  * @group APCU
@@ -40,6 +40,6 @@ class APCuCacheLockTest extends LockTest
 
 	protected function getInstance()
 	{
-		return new CacheLock(new APCuCache('localhost'));
+		return new \Friendica\Core\Lock\Type\CacheLock(new APCuCache('localhost'));
 	}
 }
diff --git a/tests/src/Core/Lock/ArrayCacheLockTest.php b/tests/src/Core/Lock/ArrayCacheLockTest.php
index 93c2c2052..4f6bf3fe9 100644
--- a/tests/src/Core/Lock/ArrayCacheLockTest.php
+++ b/tests/src/Core/Lock/ArrayCacheLockTest.php
@@ -22,13 +22,13 @@
 namespace Friendica\Test\src\Core\Lock;
 
 use Friendica\Core\Cache\Type\ArrayCache;
-use Friendica\Core\Lock\CacheLock;
+use Friendica\Core\Lock\Type\CacheLock;
 
 class ArrayCacheLockTest extends LockTest
 {
 	protected function getInstance()
 	{
-		return new CacheLock(new ArrayCache('localhost'));
+		return new \Friendica\Core\Lock\Type\CacheLock(new ArrayCache('localhost'));
 	}
 
 	/**
diff --git a/tests/src/Core/Lock/DatabaseLockDriverTest.php b/tests/src/Core/Lock/DatabaseLockDriverTest.php
index 86209d5c7..e08a0d7ca 100644
--- a/tests/src/Core/Lock/DatabaseLockDriverTest.php
+++ b/tests/src/Core/Lock/DatabaseLockDriverTest.php
@@ -21,7 +21,7 @@
 
 namespace Friendica\Test\src\Core\Lock;
 
-use Friendica\Core\Lock\DatabaseLock;
+use Friendica\Core\Lock\Type\DatabaseLock;
 use Friendica\Core\Config\Factory\ConfigFactory;
 use Friendica\Test\DatabaseTestTrait;
 use Friendica\Test\Util\Database\StaticDatabase;
diff --git a/tests/src/Core/Lock/MemcacheCacheLockTest.php b/tests/src/Core/Lock/MemcacheCacheLockTest.php
index efb27dcab..a3068b6a5 100644
--- a/tests/src/Core/Lock/MemcacheCacheLockTest.php
+++ b/tests/src/Core/Lock/MemcacheCacheLockTest.php
@@ -24,7 +24,7 @@ namespace Friendica\Test\src\Core\Lock;
 use Exception;
 use Friendica\Core\Cache\Type\MemcacheCache;
 use Friendica\Core\Config\IConfig;
-use Friendica\Core\Lock\CacheLock;
+use Friendica\Core\Lock\Type\CacheLock;
 use Mockery;
 
 /**
@@ -53,7 +53,7 @@ class MemcacheCacheLockTest extends LockTest
 
 		try {
 			$cache = new MemcacheCache($host, $configMock);
-			$lock = new CacheLock($cache);
+			$lock = new \Friendica\Core\Lock\Type\CacheLock($cache);
 		} catch (Exception $e) {
 			static::markTestSkipped('Memcache is not available');
 		}
diff --git a/tests/src/Core/Lock/MemcachedCacheLockTest.php b/tests/src/Core/Lock/MemcachedCacheLockTest.php
index f72936484..26cc16f22 100644
--- a/tests/src/Core/Lock/MemcachedCacheLockTest.php
+++ b/tests/src/Core/Lock/MemcachedCacheLockTest.php
@@ -24,7 +24,7 @@ namespace Friendica\Test\src\Core\Lock;
 use Exception;
 use Friendica\Core\Cache\Type\MemcachedCache;
 use Friendica\Core\Config\IConfig;
-use Friendica\Core\Lock\CacheLock;
+use Friendica\Core\Lock\Type\CacheLock;
 use Mockery;
 use Psr\Log\NullLogger;
 
diff --git a/tests/src/Core/Lock/RedisCacheLockTest.php b/tests/src/Core/Lock/RedisCacheLockTest.php
index 6fdbd1eeb..fba68b197 100644
--- a/tests/src/Core/Lock/RedisCacheLockTest.php
+++ b/tests/src/Core/Lock/RedisCacheLockTest.php
@@ -24,7 +24,7 @@ namespace Friendica\Test\src\Core\Lock;
 use Exception;
 use Friendica\Core\Cache\Type\RedisCache;
 use Friendica\Core\Config\IConfig;
-use Friendica\Core\Lock\CacheLock;
+use Friendica\Core\Lock\Type\CacheLock;
 use Mockery;
 
 /**
@@ -62,7 +62,7 @@ class RedisCacheLockTest extends LockTest
 
 		try {
 			$cache = new RedisCache($host, $configMock);
-			$lock = new CacheLock($cache);
+			$lock = new \Friendica\Core\Lock\Type\CacheLock($cache);
 		} catch (Exception $e) {
 			static::markTestSkipped('Redis is not available. Error: ' . $e->getMessage());
 		}
diff --git a/tests/src/Core/Lock/SemaphoreLockTest.php b/tests/src/Core/Lock/SemaphoreLockTest.php
index 89a3ec633..59b110a33 100644
--- a/tests/src/Core/Lock/SemaphoreLockTest.php
+++ b/tests/src/Core/Lock/SemaphoreLockTest.php
@@ -25,7 +25,7 @@ use Dice\Dice;
 use Friendica\App;
 use Friendica\Core\Config\IConfig;
 use Friendica\Core\Config\Type\JitConfig;
-use Friendica\Core\Lock\SemaphoreLock;
+use Friendica\Core\Lock\Type\SemaphoreLock;
 use Friendica\DI;
 use Mockery;
 use Mockery\MockInterface;
@@ -56,7 +56,7 @@ class SemaphoreLockTest extends LockTest
 
 	protected function getInstance()
 	{
-		return new SemaphoreLock();
+		return new \Friendica\Core\Lock\Type\SemaphoreLock();
 	}
 
 	/**