diff --git a/application/startup.inc.php b/application/startup.inc.php
index da2b674b6..79a1f3fff 100644
--- a/application/startup.inc.php
+++ b/application/startup.inc.php
@@ -15,6 +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\Helper\Session;
 use Combodo\iTop\Service\EventData;
 use Combodo\iTop\Service\EventService;
diff --git a/lib/composer/autoload_classmap.php b/lib/composer/autoload_classmap.php
index f7b664407..403a1b3a8 100644
--- a/lib/composer/autoload_classmap.php
+++ b/lib/composer/autoload_classmap.php
@@ -21,7 +21,6 @@ return array(
     'AjaxPage' => $baseDir . '/sources/Application/WebPage/AjaxPage.php',
     'ApcService' => $baseDir . '/core/apc-service.class.inc.php',
     'ApplicationContext' => $baseDir . '/application/applicationcontext.class.inc.php',
-    'ApplicationEvents' => $baseDir . '/application/applicationevents.class.inc.php',
     'ApplicationException' => $baseDir . '/application/exceptions/ApplicationException.php',
     'ApplicationMenu' => $baseDir . '/application/menunode.class.inc.php',
     'ApplicationPopupMenuItem' => $baseDir . '/application/applicationextension.inc.php',
@@ -192,6 +191,7 @@ 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\\Helper\\Session' => $baseDir . '/sources/Application/Helper/Session.php',
     'Combodo\\iTop\\Application\\Helper\\WebResourcesHelper' => $baseDir . '/sources/Application/Helper/WebResourcesHelper.php',
diff --git a/lib/composer/autoload_static.php b/lib/composer/autoload_static.php
index cb40e9c6c..575728ff8 100644
--- a/lib/composer/autoload_static.php
+++ b/lib/composer/autoload_static.php
@@ -386,7 +386,6 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'AjaxPage' => __DIR__ . '/../..' . '/sources/Application/WebPage/AjaxPage.php',
         'ApcService' => __DIR__ . '/../..' . '/core/apc-service.class.inc.php',
         'ApplicationContext' => __DIR__ . '/../..' . '/application/applicationcontext.class.inc.php',
-        'ApplicationEvents' => __DIR__ . '/../..' . '/application/applicationevents.class.inc.php',
         'ApplicationException' => __DIR__ . '/../..' . '/application/exceptions/ApplicationException.php',
         'ApplicationMenu' => __DIR__ . '/../..' . '/application/menunode.class.inc.php',
         'ApplicationPopupMenuItem' => __DIR__ . '/../..' . '/application/applicationextension.inc.php',
@@ -557,6 +556,7 @@ 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\\Helper\\Session' => __DIR__ . '/../..' . '/sources/Application/Helper/Session.php',
         'Combodo\\iTop\\Application\\Helper\\WebResourcesHelper' => __DIR__ . '/../..' . '/sources/Application/Helper/WebResourcesHelper.php',
diff --git a/application/applicationevents.class.inc.php b/sources/Application/ApplicationEvents.php
similarity index 96%
rename from application/applicationevents.class.inc.php
rename to sources/Application/ApplicationEvents.php
index 9a651aa70..ad9e096bb 100644
--- a/application/applicationevents.class.inc.php
+++ b/sources/Application/ApplicationEvents.php
@@ -1,10 +1,11 @@
 <?php
-
 /*
  * @copyright   Copyright (C) 2010-2022 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
+namespace Combodo\iTop\Application;
+
 use Combodo\iTop\Service\Description\EventDescription;
 use Combodo\iTop\Service\EventService;
 use Combodo\iTop\Service\iEventServiceSetup;