diff --git a/application/startup.inc.php b/application/startup.inc.php
index 7bb5f0532..e5a37a900 100644
--- a/application/startup.inc.php
+++ b/application/startup.inc.php
@@ -15,7 +15,7 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-use Combodo\iTop\Application\ApplicationEvents;
+use Combodo\iTop\Application\EventRegister\ApplicationEvents;
 use Combodo\iTop\Application\Helper\Session;
 use Combodo\iTop\Service\Events\EventData;
 use Combodo\iTop\Service\Events\EventService;
diff --git a/lib/composer/autoload_classmap.php b/lib/composer/autoload_classmap.php
index 1abba84ac..77406d095 100644
--- a/lib/composer/autoload_classmap.php
+++ b/lib/composer/autoload_classmap.php
@@ -188,8 +188,8 @@ return array(
     'CharConcatWSExpression' => $baseDir . '/core/oql/expression.class.inc.php',
     'CheckStopWatchThresholds' => $baseDir . '/core/ormstopwatch.class.inc.php',
     'CheckableExpression' => $baseDir . '/core/oql/oqlquery.class.inc.php',
-    'Combodo\\iTop\\Application\\ApplicationEvents' => $baseDir . '/sources/Application/ApplicationEvents.php',
     'Combodo\\iTop\\Application\\Branding' => $baseDir . '/sources/Application/Branding.php',
+    'Combodo\\iTop\\Application\\EventRegister\\ApplicationEvents' => $baseDir . '/sources/Application/EventRegister/ApplicationEvents.php',
     'Combodo\\iTop\\Application\\Helper\\Session' => $baseDir . '/sources/Application/Helper/Session.php',
     'Combodo\\iTop\\Application\\Helper\\WebResourcesHelper' => $baseDir . '/sources/Application/Helper/WebResourcesHelper.php',
     'Combodo\\iTop\\Application\\Search\\AjaxSearchException' => $baseDir . '/sources/Application/Search/ajaxsearchexception.class.inc.php',
diff --git a/lib/composer/autoload_static.php b/lib/composer/autoload_static.php
index 63b1f42c8..eac8a2a76 100644
--- a/lib/composer/autoload_static.php
+++ b/lib/composer/autoload_static.php
@@ -553,8 +553,8 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'CharConcatWSExpression' => __DIR__ . '/../..' . '/core/oql/expression.class.inc.php',
         'CheckStopWatchThresholds' => __DIR__ . '/../..' . '/core/ormstopwatch.class.inc.php',
         'CheckableExpression' => __DIR__ . '/../..' . '/core/oql/oqlquery.class.inc.php',
-        'Combodo\\iTop\\Application\\ApplicationEvents' => __DIR__ . '/../..' . '/sources/Application/ApplicationEvents.php',
         'Combodo\\iTop\\Application\\Branding' => __DIR__ . '/../..' . '/sources/Application/Branding.php',
+        'Combodo\\iTop\\Application\\EventRegister\\ApplicationEvents' => __DIR__ . '/../..' . '/sources/Application/EventRegister/ApplicationEvents.php',
         'Combodo\\iTop\\Application\\Helper\\Session' => __DIR__ . '/../..' . '/sources/Application/Helper/Session.php',
         'Combodo\\iTop\\Application\\Helper\\WebResourcesHelper' => __DIR__ . '/../..' . '/sources/Application/Helper/WebResourcesHelper.php',
         'Combodo\\iTop\\Application\\Search\\AjaxSearchException' => __DIR__ . '/../..' . '/sources/Application/Search/ajaxsearchexception.class.inc.php',
diff --git a/sources/Application/ApplicationEvents.php b/sources/Application/EventRegister/ApplicationEvents.php
similarity index 82%
rename from sources/Application/ApplicationEvents.php
rename to sources/Application/EventRegister/ApplicationEvents.php
index fa197a670..a304fd8fa 100644
--- a/sources/Application/ApplicationEvents.php
+++ b/sources/Application/EventRegister/ApplicationEvents.php
@@ -1,10 +1,10 @@
 <?php
 /*
- * @copyright   Copyright (C) 2010-2022 Combodo SARL
+ * @copyright   Copyright (C) 2010-2023 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
-namespace Combodo\iTop\Application;
+namespace Combodo\iTop\Application\EventRegister;
 
 use Combodo\iTop\Service\Events\Description\EventDescription;
 use Combodo\iTop\Service\Events\EventService;
@@ -14,7 +14,7 @@ use Combodo\iTop\Service\Events\iEventServiceSetup;
  * Class ApplicationEvents
  *
  * @author Eric Espie <eric.espie@combodo.com>
- * @package Combodo\iTop\Application
+ * @package Combodo\iTop\Application\EventRegister
  * @since 3.1.0
  */
 class ApplicationEvents implements iEventServiceSetup