diff --git a/lib/composer/autoload_classmap.php b/lib/composer/autoload_classmap.php
index 5248d45c5..1f254f382 100644
--- a/lib/composer/autoload_classmap.php
+++ b/lib/composer/autoload_classmap.php
@@ -435,8 +435,6 @@ return array(
     'Combodo\\iTop\\Dependencies\\AbstractFolderAnalyzer' => $baseDir . '/sources/Dependencies/AbstractFolderAnalyzer.php',
     'Combodo\\iTop\\Dependencies\\Composer\\iTopComposer' => $baseDir . '/sources/Dependencies/Composer/iTopComposer.php',
     'Combodo\\iTop\\Dependencies\\NPM\\iTopNPM' => $baseDir . '/sources/Dependencies/NPM/iTopNPM.php',
-    'Combodo\\iTop\\DependencyInjection\\DIException' => $baseDir . '/sources/DependencyInjection/DIException.php',
-    'Combodo\\iTop\\DependencyInjection\\DIService' => $baseDir . '/sources/DependencyInjection/DIService.php',
     'Combodo\\iTop\\DesignDocument' => $baseDir . '/core/designdocument.class.inc.php',
     'Combodo\\iTop\\DesignElement' => $baseDir . '/core/designdocument.class.inc.php',
     'Combodo\\iTop\\Form\\Field\\AbstractSimpleField' => $baseDir . '/sources/Form/Field/AbstractSimpleField.php',
@@ -556,6 +554,8 @@ return array(
     'Combodo\\iTop\\Service\\Base\\ObjectRepository' => $baseDir . '/sources/Service/Base/ObjectRepository.php',
     'Combodo\\iTop\\Service\\Base\\iDataPostProcessor' => $baseDir . '/sources/Service/Base/iDataPostProcessor.php',
     'Combodo\\iTop\\Service\\Cache\\DataModelDependantCache' => $baseDir . '/sources/Service/Cache/DataModelDependantCache.php',
+    'Combodo\\iTop\\Service\\DependencyInjection\\DIException' => $baseDir . '/sources/Service/DependencyInjection/DIException.php',
+    'Combodo\\iTop\\Service\\DependencyInjection\\DIService' => $baseDir . '/sources/Service/DependencyInjection/DIService.php',
     'Combodo\\iTop\\Service\\Events\\Description\\EventDataDescription' => $baseDir . '/sources/Service/Events/Description/EventDataDescription.php',
     'Combodo\\iTop\\Service\\Events\\Description\\EventDescription' => $baseDir . '/sources/Service/Events/Description/EventDescription.php',
     'Combodo\\iTop\\Service\\Events\\EventData' => $baseDir . '/sources/Service/Events/EventData.php',
diff --git a/lib/composer/autoload_static.php b/lib/composer/autoload_static.php
index 3af9f9caa..0238b2704 100644
--- a/lib/composer/autoload_static.php
+++ b/lib/composer/autoload_static.php
@@ -816,8 +816,6 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'Combodo\\iTop\\Dependencies\\AbstractFolderAnalyzer' => __DIR__ . '/../..' . '/sources/Dependencies/AbstractFolderAnalyzer.php',
         'Combodo\\iTop\\Dependencies\\Composer\\iTopComposer' => __DIR__ . '/../..' . '/sources/Dependencies/Composer/iTopComposer.php',
         'Combodo\\iTop\\Dependencies\\NPM\\iTopNPM' => __DIR__ . '/../..' . '/sources/Dependencies/NPM/iTopNPM.php',
-        'Combodo\\iTop\\DependencyInjection\\DIException' => __DIR__ . '/../..' . '/sources/DependencyInjection/DIException.php',
-        'Combodo\\iTop\\DependencyInjection\\DIService' => __DIR__ . '/../..' . '/sources/DependencyInjection/DIService.php',
         'Combodo\\iTop\\DesignDocument' => __DIR__ . '/../..' . '/core/designdocument.class.inc.php',
         'Combodo\\iTop\\DesignElement' => __DIR__ . '/../..' . '/core/designdocument.class.inc.php',
         'Combodo\\iTop\\Form\\Field\\AbstractSimpleField' => __DIR__ . '/../..' . '/sources/Form/Field/AbstractSimpleField.php',
@@ -937,6 +935,8 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'Combodo\\iTop\\Service\\Base\\ObjectRepository' => __DIR__ . '/../..' . '/sources/Service/Base/ObjectRepository.php',
         'Combodo\\iTop\\Service\\Base\\iDataPostProcessor' => __DIR__ . '/../..' . '/sources/Service/Base/iDataPostProcessor.php',
         'Combodo\\iTop\\Service\\Cache\\DataModelDependantCache' => __DIR__ . '/../..' . '/sources/Service/Cache/DataModelDependantCache.php',
+        'Combodo\\iTop\\Service\\DependencyInjection\\DIException' => __DIR__ . '/../..' . '/sources/Service/DependencyInjection/DIException.php',
+        'Combodo\\iTop\\Service\\DependencyInjection\\DIService' => __DIR__ . '/../..' . '/sources/Service/DependencyInjection/DIService.php',
         'Combodo\\iTop\\Service\\Events\\Description\\EventDataDescription' => __DIR__ . '/../..' . '/sources/Service/Events/Description/EventDataDescription.php',
         'Combodo\\iTop\\Service\\Events\\Description\\EventDescription' => __DIR__ . '/../..' . '/sources/Service/Events/Description/EventDescription.php',
         'Combodo\\iTop\\Service\\Events\\EventData' => __DIR__ . '/../..' . '/sources/Service/Events/EventData.php',
diff --git a/sources/Forms/Block/DataModel/AttributeChoiceFormBlock.php b/sources/Forms/Block/DataModel/AttributeChoiceFormBlock.php
index 63cc1667c..d511d530e 100644
--- a/sources/Forms/Block/DataModel/AttributeChoiceFormBlock.php
+++ b/sources/Forms/Block/DataModel/AttributeChoiceFormBlock.php
@@ -7,7 +7,7 @@
 
 namespace Combodo\iTop\Forms\Block\DataModel;
 
-use Combodo\iTop\DependencyInjection\DIService;
+use Combodo\iTop\Service\DependencyInjection\DIService;
 use Combodo\iTop\Forms\Block\Base\ChoiceFormBlock;
 use Combodo\iTop\Forms\IO\Converter\StringToAttributeConverter;
 use Combodo\iTop\Forms\IO\Format\AttributeIOFormat;
@@ -47,7 +47,7 @@ class AttributeChoiceFormBlock extends ChoiceFormBlock
 	/**
 	 * @param \Combodo\iTop\Forms\Register\OptionsRegister $oOptionsRegister
 	 *
-	 * @throws \Combodo\iTop\DependencyInjection\DIException
+	 * @throws \Combodo\iTop\Service\DependencyInjection\DIException
 	 * @throws \Combodo\iTop\Forms\Block\FormBlockException
 	 * @throws \Combodo\iTop\Forms\Register\RegisterException
 	 */
diff --git a/sources/Forms/Block/DataModel/AttributeValueChoiceFormBlock.php b/sources/Forms/Block/DataModel/AttributeValueChoiceFormBlock.php
index 260f5dbb7..a1905b054 100644
--- a/sources/Forms/Block/DataModel/AttributeValueChoiceFormBlock.php
+++ b/sources/Forms/Block/DataModel/AttributeValueChoiceFormBlock.php
@@ -7,7 +7,7 @@
 
 namespace Combodo\iTop\Forms\Block\DataModel;
 
-use Combodo\iTop\DependencyInjection\DIService;
+use Combodo\iTop\Service\DependencyInjection\DIService;
 use Combodo\iTop\Forms\Block\Base\ChoiceFormBlock;
 use Combodo\iTop\Forms\Block\FormBlockException;
 use Combodo\iTop\Forms\IO\Format\AttributeIOFormat;
diff --git a/sources/Forms/IO/Converter/OqlToClassConverter.php b/sources/Forms/IO/Converter/OqlToClassConverter.php
index 56a2dec86..1ee291865 100644
--- a/sources/Forms/IO/Converter/OqlToClassConverter.php
+++ b/sources/Forms/IO/Converter/OqlToClassConverter.php
@@ -7,7 +7,7 @@
 
 namespace Combodo\iTop\Forms\IO\Converter;
 
-use Combodo\iTop\DependencyInjection\DIService;
+use Combodo\iTop\Service\DependencyInjection\DIService;
 use Combodo\iTop\Forms\IO\Format\ClassIOFormat;
 use Combodo\iTop\Forms\IO\FormBlockIOException;
 
@@ -18,7 +18,7 @@ class OqlToClassConverter extends AbstractConverter
 {
 	/** @inheritdoc
 	 * @throws \Combodo\iTop\Forms\IO\FormBlockIOException
-	 * @throws \Combodo\iTop\DependencyInjection\DIException
+	 * @throws \Combodo\iTop\Service\DependencyInjection\DIException
 	 */
 	public function Convert(mixed $oData): ?ClassIOFormat
 	{
diff --git a/sources/Forms/IO/Format/ClassIOFormat.php b/sources/Forms/IO/Format/ClassIOFormat.php
index f59d778d7..a8d57886a 100644
--- a/sources/Forms/IO/Format/ClassIOFormat.php
+++ b/sources/Forms/IO/Format/ClassIOFormat.php
@@ -2,7 +2,7 @@
 
 namespace Combodo\iTop\Forms\IO\Format;
 
-use Combodo\iTop\DependencyInjection\DIService;
+use Combodo\iTop\Service\DependencyInjection\DIService;
 use Combodo\iTop\Forms\IO\FormBlockIOException;
 
 class ClassIOFormat extends AbstractIOFormat
@@ -10,7 +10,7 @@ class ClassIOFormat extends AbstractIOFormat
 	public string $sClassName;
 
 	/**
-	 * @throws \Combodo\iTop\DependencyInjection\DIException
+	 * @throws \Combodo\iTop\Service\DependencyInjection\DIException
 	 * @throws \Combodo\iTop\Forms\IO\FormBlockIOException
 	 */
 	public function __construct(string $sClassName)
diff --git a/sources/DependencyInjection/DIException.php b/sources/Service/DependencyInjection/DIException.php
similarity index 89%
rename from sources/DependencyInjection/DIException.php
rename to sources/Service/DependencyInjection/DIException.php
index b3926ba7f..928f1c08c 100644
--- a/sources/DependencyInjection/DIException.php
+++ b/sources/Service/DependencyInjection/DIException.php
@@ -5,7 +5,7 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
-namespace Combodo\iTop\DependencyInjection;
+namespace Combodo\iTop\Service\DependencyInjection;
 
 use IssueLog;
 use Throwable;
diff --git a/sources/DependencyInjection/DIService.php b/sources/Service/DependencyInjection/DIService.php
similarity index 90%
rename from sources/DependencyInjection/DIService.php
rename to sources/Service/DependencyInjection/DIService.php
index 60ae00b85..896223402 100644
--- a/sources/DependencyInjection/DIService.php
+++ b/sources/Service/DependencyInjection/DIService.php
@@ -5,7 +5,7 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
-namespace Combodo\iTop\DependencyInjection;
+namespace Combodo\iTop\Service\DependencyInjection;
 
 class DIService
 {
@@ -48,7 +48,7 @@ class DIService
 	 * @param string $sName name of the service to get
 	 *
 	 * @return mixed
-	 * @throws \Combodo\iTop\DependencyInjection\DIException
+	 * @throws \Combodo\iTop\Service\DependencyInjection\DIException
 	 */
 	final public function GetService(string $sName): mixed
 	{