diff --git a/src/App.php b/src/App.php
index 738370ede3..7f8e03b5e8 100644
--- a/src/App.php
+++ b/src/App.php
@@ -20,6 +20,7 @@ use Friendica\Content\Nav;
 use Friendica\Core\Addon\Capability\ICanLoadAddons;
 use Friendica\Core\Config\Factory\Config;
 use Friendica\Core\Container;
+use Friendica\Core\Hooks\HookEventBridge;
 use Friendica\Core\Logger\LoggerManager;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session\Capability\IHandleUserSessions;
@@ -35,7 +36,6 @@ use Friendica\Database\Definition\DbaDefinition;
 use Friendica\Database\Definition\ViewDefinition;
 use Friendica\Event\ConfigLoadedEvent;
 use Friendica\Event\Event;
-use Friendica\EventSubscriber\HookEventBridge;
 use Friendica\Module\Maintenance;
 use Friendica\Module\Special\HTTPException as ModuleHTTPException;
 use Friendica\Network\HTTPException;
diff --git a/src/EventSubscriber/HookEventBridge.php b/src/Core/Hooks/HookEventBridge.php
similarity index 98%
rename from src/EventSubscriber/HookEventBridge.php
rename to src/Core/Hooks/HookEventBridge.php
index f5dde4fbb7..2dad2d2b23 100644
--- a/src/EventSubscriber/HookEventBridge.php
+++ b/src/Core/Hooks/HookEventBridge.php
@@ -7,7 +7,7 @@
 
 declare(strict_types=1);
 
-namespace Friendica\EventSubscriber;
+namespace Friendica\Core\Hooks;
 
 use Friendica\Core\Hook;
 use Friendica\Event\ArrayFilterEvent;
diff --git a/tests/Unit/EventSubscriber/HookEventBridgeTest.php b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
similarity index 98%
rename from tests/Unit/EventSubscriber/HookEventBridgeTest.php
rename to tests/Unit/Core/Hooks/HookEventBridgeTest.php
index 07bfa81229..671eb23e94 100644
--- a/tests/Unit/EventSubscriber/HookEventBridgeTest.php
+++ b/tests/Unit/Core/Hooks/HookEventBridgeTest.php
@@ -7,14 +7,14 @@
 
 declare(strict_types=1);
 
-namespace Friendica\Test\Unit\EventSubscriber;
+namespace Friendica\Test\Unit\Core\Hooks;
 
 use Friendica\Core\Config\Util\ConfigFileManager;
+use Friendica\Core\Hooks\HookEventBridge;
 use Friendica\Event\ArrayFilterEvent;
 use Friendica\Event\ConfigLoadedEvent;
 use Friendica\Event\Event;
 use Friendica\Event\HtmlFilterEvent;
-use Friendica\EventSubscriber\HookEventBridge;
 use PHPUnit\Framework\TestCase;
 
 class HookEventBridgeTest extends TestCase