diff --git a/application/loginwebpage.class.inc.php b/application/loginwebpage.class.inc.php
index ab8138636..4eafca30e 100644
--- a/application/loginwebpage.class.inc.php
+++ b/application/loginwebpage.class.inc.php
@@ -26,8 +26,8 @@
 
 use Combodo\iTop\Application\Branding;
 use Combodo\iTop\Application\Helper\Session;
-use Combodo\iTop\Service\EventData;
-use Combodo\iTop\Service\EventService;
+use Combodo\iTop\Service\Events\EventData;
+use Combodo\iTop\Service\Events\EventService;
 
 /**
  * Web page used for displaying the login form
diff --git a/application/startup.inc.php b/application/startup.inc.php
index 79a1f3fff..ce83bf8ce 100644
--- a/application/startup.inc.php
+++ b/application/startup.inc.php
@@ -17,8 +17,8 @@
 //   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;
+use Combodo\iTop\Service\Events\EventData;
+use Combodo\iTop\Service\Events\EventService;
 
 require_once(APPROOT.'core/cmdbobject.class.inc.php');
 require_once(APPROOT.'application/utils.inc.php');
diff --git a/core/dbobject.class.php b/core/dbobject.class.php
index 9f9490a14..b567fa601 100644
--- a/core/dbobject.class.php
+++ b/core/dbobject.class.php
@@ -5,8 +5,8 @@
  */
 
 use Combodo\iTop\Core\MetaModel\FriendlyNameType;
-use Combodo\iTop\Service\EventData;
-use Combodo\iTop\Service\EventService;
+use Combodo\iTop\Service\Events\EventData;
+use Combodo\iTop\Service\Events\EventService;
 
 /**
  * All objects to be displayed in the application (either as a list or as details)
diff --git a/core/ormdocument.class.inc.php b/core/ormdocument.class.inc.php
index 640672fa6..5fef82e6b 100644
--- a/core/ormdocument.class.inc.php
+++ b/core/ormdocument.class.inc.php
@@ -25,8 +25,8 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
-use Combodo\iTop\Service\EventData;
-use Combodo\iTop\Service\EventService;
+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 403a1b3a8..da17917f9 100644
--- a/lib/composer/autoload_classmap.php
+++ b/lib/composer/autoload_classmap.php
@@ -428,12 +428,12 @@ return array(
     'Combodo\\iTop\\Renderer\\FormRenderer' => $baseDir . '/sources/Renderer/FormRenderer.php',
     'Combodo\\iTop\\Renderer\\RenderingOutput' => $baseDir . '/sources/Renderer/RenderingOutput.php',
     'Combodo\\iTop\\Router\\Router' => $baseDir . '/sources/Router/Router.php',
-    'Combodo\\iTop\\Service\\Description\\EventDataDescription' => $baseDir . '/sources/Application/Service/Description/EventDataDescription.php',
-    'Combodo\\iTop\\Service\\Description\\EventDescription' => $baseDir . '/sources/Application/Service/Description/EventDescription.php',
-    'Combodo\\iTop\\Service\\EventData' => $baseDir . '/sources/Application/Service/EventData.php',
-    'Combodo\\iTop\\Service\\EventHelper' => $baseDir . '/sources/Application/Service/EventHelper.php',
-    'Combodo\\iTop\\Service\\EventService' => $baseDir . '/sources/Application/Service/EventService.php',
-    'Combodo\\iTop\\Service\\iEventServiceSetup' => $baseDir . '/sources/Application/Service/iEventServiceSetup.php',
+    'Combodo\\iTop\\Service\\Events\\Description\\EventDataDescription' => $baseDir . '/sources/Application/Service/Events/Description/EventDataDescription.php',
+    'Combodo\\iTop\\Service\\Events\\Description\\EventDescription' => $baseDir . '/sources/Application/Service/Events/Description/EventDescription.php',
+    'Combodo\\iTop\\Service\\Events\\EventData' => $baseDir . '/sources/Application/Service/Events/EventData.php',
+    'Combodo\\iTop\\Service\\Events\\EventHelper' => $baseDir . '/sources/Application/Service/Events/EventHelper.php',
+    'Combodo\\iTop\\Service\\Events\\EventService' => $baseDir . '/sources/Application/Service/Events/EventService.php',
+    'Combodo\\iTop\\Service\\Events\\iEventServiceSetup' => $baseDir . '/sources/Application/Service/Events/iEventServiceSetup.php',
     'CompileCSSService' => $baseDir . '/application/compilecssservice.class.inc.php',
     'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
     'Config' => $baseDir . '/core/config.class.inc.php',
diff --git a/lib/composer/autoload_static.php b/lib/composer/autoload_static.php
index 575728ff8..b71040a7f 100644
--- a/lib/composer/autoload_static.php
+++ b/lib/composer/autoload_static.php
@@ -793,12 +793,12 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'Combodo\\iTop\\Renderer\\FormRenderer' => __DIR__ . '/../..' . '/sources/Renderer/FormRenderer.php',
         'Combodo\\iTop\\Renderer\\RenderingOutput' => __DIR__ . '/../..' . '/sources/Renderer/RenderingOutput.php',
         'Combodo\\iTop\\Router\\Router' => __DIR__ . '/../..' . '/sources/Router/Router.php',
-        'Combodo\\iTop\\Service\\Description\\EventDataDescription' => __DIR__ . '/../..' . '/sources/Application/Service/Description/EventDataDescription.php',
-        'Combodo\\iTop\\Service\\Description\\EventDescription' => __DIR__ . '/../..' . '/sources/Application/Service/Description/EventDescription.php',
-        'Combodo\\iTop\\Service\\EventData' => __DIR__ . '/../..' . '/sources/Application/Service/EventData.php',
-        'Combodo\\iTop\\Service\\EventHelper' => __DIR__ . '/../..' . '/sources/Application/Service/EventHelper.php',
-        'Combodo\\iTop\\Service\\EventService' => __DIR__ . '/../..' . '/sources/Application/Service/EventService.php',
-        'Combodo\\iTop\\Service\\iEventServiceSetup' => __DIR__ . '/../..' . '/sources/Application/Service/iEventServiceSetup.php',
+        'Combodo\\iTop\\Service\\Events\\Description\\EventDataDescription' => __DIR__ . '/../..' . '/sources/Application/Service/Events/Description/EventDataDescription.php',
+        'Combodo\\iTop\\Service\\Events\\Description\\EventDescription' => __DIR__ . '/../..' . '/sources/Application/Service/Events/Description/EventDescription.php',
+        'Combodo\\iTop\\Service\\Events\\EventData' => __DIR__ . '/../..' . '/sources/Application/Service/Events/EventData.php',
+        'Combodo\\iTop\\Service\\Events\\EventHelper' => __DIR__ . '/../..' . '/sources/Application/Service/Events/EventHelper.php',
+        'Combodo\\iTop\\Service\\Events\\EventService' => __DIR__ . '/../..' . '/sources/Application/Service/Events/EventService.php',
+        'Combodo\\iTop\\Service\\Events\\iEventServiceSetup' => __DIR__ . '/../..' . '/sources/Application/Service/Events/iEventServiceSetup.php',
         'CompileCSSService' => __DIR__ . '/../..' . '/application/compilecssservice.class.inc.php',
         'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
         'Config' => __DIR__ . '/../..' . '/core/config.class.inc.php',
diff --git a/pages/schema.php b/pages/schema.php
index f7d50ab2e..64cde9916 100644
--- a/pages/schema.php
+++ b/pages/schema.php
@@ -12,7 +12,7 @@ use Combodo\iTop\Application\UI\Base\Component\Input\Select\SelectOptionUIBlockF
 use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Title\TitleUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\PageContent\PageContentWithSideContent;
-use Combodo\iTop\Service\EventService;
+use Combodo\iTop\Service\Events\EventService;
 
 require_once('../approot.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
@@ -335,9 +335,9 @@ function DisplayEvents(WebPage $oPage, $sClass)
 					continue;
 				}
 			}
-			$sListener = $sListenerClass.'->'.$aListener['callback'][1].'(\Combodo\iTop\Service\EventData $oEventData)';
+			$sListener = $sListenerClass.'->'.$aListener['callback'][1].'(\Combodo\iTop\Service\Events\EventData $oEventData)';
 		} else {
-			$sListener = $aListener['callback'][0].'::'.$aListener['callback'][1].'(\Combodo\iTop\Service\EventData $oEventData)';
+			$sListener = $aListener['callback'][0].'::'.$aListener['callback'][1].'(\Combodo\iTop\Service\Events\EventData $oEventData)';
 		}
 		$aRows[] = [
 			'event'    => $aListener['event'],
diff --git a/setup/compiler.class.inc.php b/setup/compiler.class.inc.php
index ab6538d3a..9dcbc3e4a 100644
--- a/setup/compiler.class.inc.php
+++ b/setup/compiler.class.inc.php
@@ -1121,8 +1121,8 @@ EOF
 		$sConstant = $sName;
 
 		$sOutput = "const $sConstant = '$sName';\n";
-		$sOutput .= "\Combodo\iTop\Service\EventService::RegisterEvent(\n";
-		$sOutput .= "  new \Combodo\iTop\Service\Description\EventDescription(\n";
+		$sOutput .= "\Combodo\iTop\Service\Events\EventService::RegisterEvent(\n";
+		$sOutput .= "  new \Combodo\iTop\Service\Events\Description\EventDescription(\n";
 		//$sEventName
 		$sOutput .= "    '$sName',\n";
 		//$mEventSources
@@ -1147,7 +1147,7 @@ EOF
 			foreach ($aEventDescription['event_data'] as $sEventDataName => $aEventDataDescription) {
 				$sEventDataDesc = $aEventDataDescription['description'];
 				$sEventDataType = $aEventDataDescription['type'];
-				$sOutput .= "        new \Combodo\iTop\Service\Description\EventDataDescription(\n";
+				$sOutput .= "        new \Combodo\iTop\Service\Events\Description\EventDataDescription(\n";
 				$sOutput .= "            '$sEventDataName',\n";
 				$sOutput .= "            '$sEventDataDesc',\n";
 				$sOutput .= "            '$sEventDataType',\n";
@@ -1394,7 +1394,7 @@ EOF
 				}
 
 				$sListenerRank = (float)($oListener->GetChildText('rank', '0'));
-				$sEvents .= "\n		Combodo\iTop\Service\EventService::RegisterListener(\"$sEventName\", $sEventListener, \$this->m_sObjectUniqId, \"$sListenerId\", null, $sListenerRank, '$sModuleRelativeDir');";
+				$sEvents .= "\n		Combodo\iTop\Service\Events\EventService::RegisterListener(\"$sEventName\", $sEventListener, \$this->m_sObjectUniqId, \"$sListenerId\", null, $sListenerRank, '$sModuleRelativeDir');";
 			}
 		}
 
@@ -3741,7 +3741,7 @@ EOF;
 			$sEventSource = $aListener['source'];
 			$sContext = $aListener['context'];
 			$sRank = $aListener['rank'];
-			$sRegister .= "\nCombodo\iTop\Service\EventService::RegisterListener(\"$sEventName\", '$sClassName::$sCallback', $sEventSource, null, $sContext, $sRank, '$sModuleId');";
+			$sRegister .= "\nCombodo\iTop\Service\Events\EventService::RegisterListener(\"$sEventName\", '$sClassName::$sCallback', $sEventSource, null, $sContext, $sRank, '$sModuleId');";
 			$sCallbackFct = $aListener['content'];
 			$sMethods .= "\n    $sCallbackFct\n\n";
 		}
diff --git a/test/ItopDataTestCase.php b/test/ItopDataTestCase.php
index 589b8d3a5..d833cb054 100644
--- a/test/ItopDataTestCase.php
+++ b/test/ItopDataTestCase.php
@@ -29,8 +29,8 @@ namespace Combodo\iTop\Test\UnitTest;
 use ArchivedObjectException;
 use CMDBObject;
 use CMDBSource;
-use Combodo\iTop\Service\EventData;
-use Combodo\iTop\Service\EventService;
+use Combodo\iTop\Service\Events\EventData;
+use Combodo\iTop\Service\Events\EventService;
 use Contact;
 use DBObject;
 use DBObjectSet;
diff --git a/test/service/EventTest.php b/test/service/EventTest.php
index 6a797e317..63f77e277 100644
--- a/test/service/EventTest.php
+++ b/test/service/EventTest.php
@@ -2,9 +2,9 @@
 
 namespace Combodo\iTop\Test\UnitTest\Service;
 
-use Combodo\iTop\Service\Description\EventDescription;
-use Combodo\iTop\Service\EventData;
-use Combodo\iTop\Service\EventService;
+use Combodo\iTop\Service\Events\Description\EventDescription;
+use Combodo\iTop\Service\Events\EventData;
+use Combodo\iTop\Service\Events\EventService;
 use Combodo\iTop\Test\UnitTest\ItopTestCase;
 use ContextTag;
 use Exception;