diff --git a/core/attributedef.class.inc.php b/core/attributedef.class.inc.php
index 951e45c7e..3c5182502 100644
--- a/core/attributedef.class.inc.php
+++ b/core/attributedef.class.inc.php
@@ -16,18 +16,19 @@ use Combodo\iTop\Renderer\Console\ConsoleBlockRenderer;
 use Combodo\iTop\Service\Links\LinkSetModel;
 
 require_once('MyHelpers.class.inc.php');
-require_once('ormdocument.class.inc.php');
-require_once('ormstopwatch.class.inc.php');
-require_once('ormpassword.class.inc.php');
-require_once('ormcaselog.class.inc.php');
-require_once('ormlinkset.class.inc.php');
-require_once('ormset.class.inc.php');
-require_once('ormtagset.class.inc.php');
 require_once('htmlsanitizer.class.inc.php');
 require_once('customfieldshandler.class.inc.php');
-require_once('ormcustomfieldsvalue.class.inc.php');
 require_once('datetimeformat.class.inc.php');
 
+require_once(APPROOT.'/sources/Core/Orm/ormDocument.php');
+require_once(APPROOT.'/sources/Core/Orm/ormStopWatch.php');
+require_once(APPROOT.'/sources/Core/Orm/ormPassword.php');
+require_once(APPROOT.'/sources/Core/Orm/ormCaseLog.php');
+require_once(APPROOT.'/sources/Core/Orm/ormLinkSet.php');
+require_once(APPROOT.'/sources/Core/Orm/ormSet.php');
+require_once(APPROOT.'/sources/Core/Orm/ormTagSet.php');
+require_once(APPROOT.'/sources/Core/Orm/ormCustomFieldsValue.php');
+
 
 require_once(APPROOT.'/sources/Core/AttributeDefinition/MissingColumnException.php');
 require_once(APPROOT.'/sources/Core/AttributeDefinition/iAttributeNoGroupBy.php');
diff --git a/lib/composer/autoload_classmap.php b/lib/composer/autoload_classmap.php
index bccaf23b0..8a94235ad 100644
--- a/lib/composer/autoload_classmap.php
+++ b/lib/composer/autoload_classmap.php
@@ -14,10 +14,10 @@ return array(
     'AbstractPreferencesExtension' => $baseDir . '/application/applicationextension/backoffice/AbstractPreferencesExtension.php',
     'AbstractWeeklyScheduledProcess' => $baseDir . '/core/backgroundprocess.inc.php',
     'AbstractWelcomePopupExtension' => $baseDir . '/application/applicationextension/backoffice/AbstractWelcomePopupExtension.php',
-    'Action' => $baseDir . '/sources/Core/TriggerAndAction/Action.php',
+    'Action' => $baseDir . '/sources/Application/DataModel/TriggerAndAction/Action.php',
     'ActionChecker' => $baseDir . '/core/userrights.class.inc.php',
-    'ActionEmail' => $baseDir . '/sources/Core/TriggerAndAction/ActionEmail.php',
-    'ActionNotification' => $baseDir . '/sources/Core/TriggerAndAction/ActionNotification.php',
+    'ActionEmail' => $baseDir . '/sources/Application/DataModel/TriggerAndAction/ActionEmail.php',
+    'ActionNotification' => $baseDir . '/sources/Application/DataModel/TriggerAndAction/ActionNotification.php',
     'ApcService' => $baseDir . '/core/apc-service.class.inc.php',
     'ApplicationContext' => $baseDir . '/application/applicationcontext.class.inc.php',
     'ApplicationException' => $baseDir . '/application/exceptions/ApplicationException.php',
@@ -92,7 +92,7 @@ return array(
     'BackgroundTask' => $baseDir . '/sources/Core/DataModel/BackgroundTask.php',
     'BinaryExpression' => $baseDir . '/core/oql/expression.class.inc.php',
     'BinaryOqlExpression' => $baseDir . '/core/oql/oqlquery.class.inc.php',
-    'BulkChange' => $baseDir . '/sources/Core/BulkChange/bulkchange/BulkChange.php',
+    'BulkChange' => $baseDir . '/sources/Core/BulkChange/BulkChange.php',
     'BulkChangeException' => $baseDir . '/application/exceptions/BulkChangeException.php',
     'BulkExport' => $baseDir . '/sources/Application/BulkExport/BulkExport.php',
     'BulkExportException' => $baseDir . '/sources/Application/BulkExport/BulkExportException.php',
@@ -177,16 +177,16 @@ return array(
     'CSVParser' => $baseDir . '/core/csvparser.class.inc.php',
     'CSVParserException' => $baseDir . '/application/exceptions/CSVParserException.php',
     'CURLStringFile' => $vendorDir . '/symfony/polyfill-php81/Resources/stubs/CURLStringFile.php',
-    'CellChangeSpec' => $baseDir . '/sources/Core/BulkChange/bulkchange/CellChangeSpec.php',
-    'CellStatus_Ambiguous' => $baseDir . '/sources/Core/BulkChange/bulkchange/CellStatus_Ambiguous.php',
-    'CellStatus_Issue' => $baseDir . '/sources/Core/BulkChange/bulkchange/CellStatus_Issue.php',
-    'CellStatus_Modify' => $baseDir . '/sources/Core/BulkChange/bulkchange/CellStatus_Modify.php',
-    'CellStatus_NullIssue' => $baseDir . '/sources/Core/BulkChange/bulkchange/CellStatus_NullIssue.php',
-    'CellStatus_SearchIssue' => $baseDir . '/sources/Core/BulkChange/bulkchange/CellStatus_SearchIssue.php',
-    'CellStatus_Void' => $baseDir . '/sources/Core/BulkChange/bulkchange/CellStatus_Void.php',
+    'CellChangeSpec' => $baseDir . '/sources/Core/BulkChange/CellChangeSpec.php',
+    'CellStatus_Ambiguous' => $baseDir . '/sources/Core/BulkChange/CellStatus_Ambiguous.php',
+    'CellStatus_Issue' => $baseDir . '/sources/Core/BulkChange/CellStatus_Issue.php',
+    'CellStatus_Modify' => $baseDir . '/sources/Core/BulkChange/CellStatus_Modify.php',
+    'CellStatus_NullIssue' => $baseDir . '/sources/Core/BulkChange/CellStatus_NullIssue.php',
+    'CellStatus_SearchIssue' => $baseDir . '/sources/Core/BulkChange/CellStatus_SearchIssue.php',
+    'CellStatus_Void' => $baseDir . '/sources/Core/BulkChange/CellStatus_Void.php',
     'CharConcatExpression' => $baseDir . '/core/oql/expression.class.inc.php',
     'CharConcatWSExpression' => $baseDir . '/core/oql/expression.class.inc.php',
-    'CheckStopWatchThresholds' => $baseDir . '/core/ormstopwatch.class.inc.php',
+    'CheckStopWatchThresholds' => $baseDir . '/sources/Core/Orm/ormStopWatch.php',
     'CheckableExpression' => $baseDir . '/core/oql/oqlquery.class.inc.php',
     'Combodo\\iTop\\Application\\Branding' => $baseDir . '/sources/Application/Branding.php',
     'Combodo\\iTop\\Application\\EventRegister\\ApplicationEvents' => $baseDir . '/sources/Application/EventRegister/ApplicationEvents.php',
@@ -422,7 +422,7 @@ return array(
     'Combodo\\iTop\\Core\\Kpi\\KpiLogData' => $baseDir . '/sources/Core/Kpi/KpiLogData.php',
     'Combodo\\iTop\\Core\\MetaModel\\FriendlyNameType' => $baseDir . '/sources/Core/MetaModel/FriendlyNameType.php',
     'Combodo\\iTop\\Core\\MetaModel\\HierarchicalKey' => $baseDir . '/sources/Core/MetaModel/HierarchicalKey.php',
-    'Combodo\\iTop\\Core\\Trigger\\Enum\\SubscriptionPolicy' => $baseDir . '/sources/Core/TriggerAndAction/Enum/SubscriptionPolicy.php',
+    'Combodo\\iTop\\Core\\Trigger\\Enum\\SubscriptionPolicy' => $baseDir . '/sources/Core/Trigger/Enum/SubscriptionPolicy.php',
     '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',
@@ -624,7 +624,7 @@ return array(
     'EventOnObject' => $baseDir . '/sources/Application/DataModel/Event/EventOnObject.php',
     'EventRestService' => $baseDir . '/sources/Application/DataModel/Event/EventRestService.php',
     'EventWebService' => $baseDir . '/sources/Application/DataModel/Event/EventWebService.php',
-    'ExcelBulkExport' => $baseDir . '/core/excelbulkexport.class.inc.php',
+    'ExcelBulkExport' => $baseDir . '/sources/Application/BulkExport/ExcelBulkExport.php',
     'ExcelExporter' => $baseDir . '/application/excelexporter.class.inc.php',
     'ExceptionLog' => $baseDir . '/core/log.class.inc.php',
     'ExecAsyncTask' => $baseDir . '/sources/Core/DataModel/AsyncTask/ExecAsyncTask.php',
@@ -738,7 +738,7 @@ return array(
     'GuzzleHttp\\RetryMiddleware' => $vendorDir . '/guzzlehttp/guzzle/src/RetryMiddleware.php',
     'GuzzleHttp\\TransferStats' => $vendorDir . '/guzzlehttp/guzzle/src/TransferStats.php',
     'GuzzleHttp\\Utils' => $vendorDir . '/guzzlehttp/guzzle/src/Utils.php',
-    'HTMLBulkExport' => $baseDir . '/core/htmlbulkexport.class.inc.php',
+    'HTMLBulkExport' => $baseDir . '/sources/Application/BulkExport/HTMLBulkExport.php',
     'HTMLDOMSanitizer' => $baseDir . '/core/htmlsanitizer.class.inc.php',
     'HTMLNullSanitizer' => $baseDir . '/core/htmlsanitizer.class.inc.php',
     'HTMLSanitizer' => $baseDir . '/core/htmlsanitizer.class.inc.php',
@@ -1170,7 +1170,7 @@ return array(
     'OqlUnionQuery' => $baseDir . '/core/oql/oqlquery.class.inc.php',
     'Override' => $vendorDir . '/symfony/polyfill-php83/Resources/stubs/Override.php',
     'PDF417' => $vendorDir . '/tecnickcom/tcpdf/include/barcodes/pdf417.php',
-    'PDFBulkExport' => $baseDir . '/core/pdfbulkexport.class.inc.php',
+    'PDFBulkExport' => $baseDir . '/sources/Application/BulkExport/PDFBulkExport.php',
     'PEAR' => $vendorDir . '/pear/pear-core-minimal/src/PEAR.php',
     'PEAR_ErrorStack' => $vendorDir . '/pear/pear-core-minimal/src/PEAR/ErrorStack.php',
     'PEAR_Exception' => $vendorDir . '/pear/pear_exception/PEAR/Exception.php',
@@ -1506,7 +1506,7 @@ return array(
     'RelationObjectNode' => $baseDir . '/sources/Core/RelationGraph/RelationObjectNode.php',
     'RelationRedundancyNode' => $baseDir . '/sources/Core/RelationGraph/RelationRedundancyNode.php',
     'RelationTypeIterator' => $baseDir . '/core/simplegraph.class.inc.php',
-    'ReportValue' => $baseDir . '/sources/Core/BulkChange/bulkchange/ReportValue.php',
+    'ReportValue' => $baseDir . '/sources/Core/BulkChange/ReportValue.php',
     'RestDelete' => $baseDir . '/core/restservices.class.inc.php',
     'RestResult' => $baseDir . '/application/applicationextension/rest/RestResult.php',
     'RestResultWithObjects' => $baseDir . '/core/restservices.class.inc.php',
@@ -1514,13 +1514,13 @@ return array(
     'RestUtils' => $baseDir . '/application/applicationextension/rest/RestUtils.php',
     'ReturnTypeWillChange' => $vendorDir . '/symfony/polyfill-php81/Resources/stubs/ReturnTypeWillChange.php',
     'RotatingLogFileNameBuilder' => $baseDir . '/core/log.class.inc.php',
-    'RowStatus' => $baseDir . '/sources/Core/BulkChange/bulkchange/RowStatus.php',
-    'RowStatus_Disappeared' => $baseDir . '/sources/Core/BulkChange/bulkchange/RowStatus_Disappeared.php',
-    'RowStatus_Error' => $baseDir . '/sources/Core/BulkChange/bulkchange/RowStatus_Error.php',
-    'RowStatus_Issue' => $baseDir . '/sources/Core/BulkChange/bulkchange/RowStatus_Issue.php',
-    'RowStatus_Modify' => $baseDir . '/sources/Core/BulkChange/bulkchange/RowStatus_Modify.php',
-    'RowStatus_NewObj' => $baseDir . '/sources/Core/BulkChange/bulkchange/RowStatus_NewObj.php',
-    'RowStatus_NoChange' => $baseDir . '/sources/Core/BulkChange/bulkchange/RowStatus_NoChange.php',
+    'RowStatus' => $baseDir . '/sources/Core/BulkChange/RowStatus.php',
+    'RowStatus_Disappeared' => $baseDir . '/sources/Core/BulkChange/RowStatus_Disappeared.php',
+    'RowStatus_Error' => $baseDir . '/sources/Core/BulkChange/RowStatus_Error.php',
+    'RowStatus_Issue' => $baseDir . '/sources/Core/BulkChange/RowStatus_Issue.php',
+    'RowStatus_Modify' => $baseDir . '/sources/Core/BulkChange/RowStatus_Modify.php',
+    'RowStatus_NewObj' => $baseDir . '/sources/Core/BulkChange/RowStatus_NewObj.php',
+    'RowStatus_NoChange' => $baseDir . '/sources/Core/BulkChange/RowStatus_NoChange.php',
     'RunTimeIconSelectionField' => $baseDir . '/application/forms.class.inc.php',
     'RuntimeDashboard' => $baseDir . '/application/dashboard.class.inc.php',
     'SQLExpression' => $baseDir . '/core/oql/expression.class.inc.php',
@@ -1640,7 +1640,7 @@ return array(
     'SimpleGraphException' => $baseDir . '/core/simplegraph.class.inc.php',
     'Soundasleep\\Html2Text' => $vendorDir . '/soundasleep/html2text/src/Html2Text.php',
     'Soundasleep\\Html2TextException' => $vendorDir . '/soundasleep/html2text/src/Html2TextException.php',
-    'SpreadsheetBulkExport' => $baseDir . '/core/spreadsheetbulkexport.class.inc.php',
+    'SpreadsheetBulkExport' => $baseDir . '/sources/Application/BulkExport/SpreadsheetBulkExport.php',
     'StimulusChecker' => $baseDir . '/core/userrights.class.inc.php',
     'StimulusInternal' => $baseDir . '/core/stimulus.class.inc.php',
     'StimulusUserAction' => $baseDir . '/core/stimulus.class.inc.php',
@@ -2916,7 +2916,7 @@ return array(
     'TCPDF_IMPORT' => $vendorDir . '/tecnickcom/tcpdf/tcpdf_import.php',
     'TCPDF_PARSER' => $vendorDir . '/tecnickcom/tcpdf/tcpdf_parser.php',
     'TCPDF_STATIC' => $vendorDir . '/tecnickcom/tcpdf/include/tcpdf_static.php',
-    'TabularBulkExport' => $baseDir . '/core/tabularbulkexport.class.inc.php',
+    'TabularBulkExport' => $baseDir . '/sources/Application/BulkExport/TabularBulkExport.php',
     'TagSetFieldData' => $baseDir . '/sources/Core/DataModel/TagSetFieldData.php',
     'TemplateMenuNode' => $baseDir . '/application/menunode.class.inc.php',
     'TemplateString' => $baseDir . '/core/templatestring.class.inc.php',
@@ -3181,7 +3181,7 @@ return array(
     'WeeklyRotatingLogFileNameBuilder' => $baseDir . '/core/log.class.inc.php',
     'WizardHelper' => $baseDir . '/application/wizardhelper.class.inc.php',
     'XLSXWriter' => $baseDir . '/application/xlsxwriter.class.php',
-    'XMLBulkExport' => $baseDir . '/core/xmlbulkexport.class.inc.php',
+    'XMLBulkExport' => $baseDir . '/sources/Application/BulkExport/XMLBulkExport.php',
     'appUserPreferences' => $baseDir . '/application/user.preferences.class.inc.php',
     'cmdbAbstractObject' => $baseDir . '/application/cmdbabstract.class.inc.php',
     'cmdbDataGenerator' => $baseDir . '/core/data.generator.class.inc.php',
@@ -3235,15 +3235,15 @@ return array(
     'iWorkingTimeComputer' => $baseDir . '/core/computing.inc.php',
     'lnkAuditCategoryToAuditDomain' => $baseDir . '/application/audit.domain.class.inc.php',
     'lnkTriggerAction' => $baseDir . '/sources/Application/DataModel/TriggerAndAction/lnkTriggerAction.php',
-    'ormCaseLog' => $baseDir . '/core/ormcaselog.class.inc.php',
-    'ormCustomFieldsValue' => $baseDir . '/core/ormcustomfieldsvalue.class.inc.php',
-    'ormDocument' => $baseDir . '/core/ormdocument.class.inc.php',
-    'ormLinkSet' => $baseDir . '/core/ormlinkset.class.inc.php',
-    'ormPassword' => $baseDir . '/core/ormpassword.class.inc.php',
-    'ormSet' => $baseDir . '/core/ormset.class.inc.php',
-    'ormStopWatch' => $baseDir . '/core/ormstopwatch.class.inc.php',
-    'ormStyle' => $baseDir . '/core/ormStyle.class.inc.php',
-    'ormTagSet' => $baseDir . '/core/ormtagset.class.inc.php',
+    'ormCaseLog' => $baseDir . '/sources/Core/Orm/ormCaseLog.php',
+    'ormCustomFieldsValue' => $baseDir . '/sources/Core/Orm/ormCustomFieldsValue.php',
+    'ormDocument' => $baseDir . '/sources/Core/Orm/ormDocument.php',
+    'ormLinkSet' => $baseDir . '/sources/Core/Orm/ormLinkSet.php',
+    'ormPassword' => $baseDir . '/sources/Core/Orm/ormPassword.php',
+    'ormSet' => $baseDir . '/sources/Core/Orm/ormSet.php',
+    'ormStopWatch' => $baseDir . '/sources/Core/Orm/ormStopWatch.php',
+    'ormStyle' => $baseDir . '/sources/Core/Orm/ormStyle.php',
+    'ormTagSet' => $baseDir . '/sources/Core/Orm/ormTagSet.php',
     'phpCAS' => $vendorDir . '/apereo/phpcas/source/CAS.php',
     'privUITransaction' => $baseDir . '/application/transaction.class.inc.php',
     'privUITransactionFile' => $baseDir . '/application/transaction.class.inc.php',
diff --git a/lib/composer/autoload_static.php b/lib/composer/autoload_static.php
index b9c621f74..fe609be53 100644
--- a/lib/composer/autoload_static.php
+++ b/lib/composer/autoload_static.php
@@ -392,10 +392,10 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'AbstractPreferencesExtension' => __DIR__ . '/../..' . '/application/applicationextension/backoffice/AbstractPreferencesExtension.php',
         'AbstractWeeklyScheduledProcess' => __DIR__ . '/../..' . '/core/backgroundprocess.inc.php',
         'AbstractWelcomePopupExtension' => __DIR__ . '/../..' . '/application/applicationextension/backoffice/AbstractWelcomePopupExtension.php',
-        'Action' => __DIR__ . '/../..' . '/sources/Core/TriggerAndAction/Action.php',
+        'Action' => __DIR__ . '/../..' . '/sources/Application/DataModel/TriggerAndAction/Action.php',
         'ActionChecker' => __DIR__ . '/../..' . '/core/userrights.class.inc.php',
-        'ActionEmail' => __DIR__ . '/../..' . '/sources/Core/TriggerAndAction/ActionEmail.php',
-        'ActionNotification' => __DIR__ . '/../..' . '/sources/Core/TriggerAndAction/ActionNotification.php',
+        'ActionEmail' => __DIR__ . '/../..' . '/sources/Application/DataModel/TriggerAndAction/ActionEmail.php',
+        'ActionNotification' => __DIR__ . '/../..' . '/sources/Application/DataModel/TriggerAndAction/ActionNotification.php',
         'ApcService' => __DIR__ . '/../..' . '/core/apc-service.class.inc.php',
         'ApplicationContext' => __DIR__ . '/../..' . '/application/applicationcontext.class.inc.php',
         'ApplicationException' => __DIR__ . '/../..' . '/application/exceptions/ApplicationException.php',
@@ -470,7 +470,7 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'BackgroundTask' => __DIR__ . '/../..' . '/sources/Core/DataModel/BackgroundTask.php',
         'BinaryExpression' => __DIR__ . '/../..' . '/core/oql/expression.class.inc.php',
         'BinaryOqlExpression' => __DIR__ . '/../..' . '/core/oql/oqlquery.class.inc.php',
-        'BulkChange' => __DIR__ . '/../..' . '/sources/Core/BulkChange/bulkchange/BulkChange.php',
+        'BulkChange' => __DIR__ . '/../..' . '/sources/Core/BulkChange/BulkChange.php',
         'BulkChangeException' => __DIR__ . '/../..' . '/application/exceptions/BulkChangeException.php',
         'BulkExport' => __DIR__ . '/../..' . '/sources/Application/BulkExport/BulkExport.php',
         'BulkExportException' => __DIR__ . '/../..' . '/sources/Application/BulkExport/BulkExportException.php',
@@ -555,16 +555,16 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'CSVParser' => __DIR__ . '/../..' . '/core/csvparser.class.inc.php',
         'CSVParserException' => __DIR__ . '/../..' . '/application/exceptions/CSVParserException.php',
         'CURLStringFile' => __DIR__ . '/..' . '/symfony/polyfill-php81/Resources/stubs/CURLStringFile.php',
-        'CellChangeSpec' => __DIR__ . '/../..' . '/sources/Core/BulkChange/bulkchange/CellChangeSpec.php',
-        'CellStatus_Ambiguous' => __DIR__ . '/../..' . '/sources/Core/BulkChange/bulkchange/CellStatus_Ambiguous.php',
-        'CellStatus_Issue' => __DIR__ . '/../..' . '/sources/Core/BulkChange/bulkchange/CellStatus_Issue.php',
-        'CellStatus_Modify' => __DIR__ . '/../..' . '/sources/Core/BulkChange/bulkchange/CellStatus_Modify.php',
-        'CellStatus_NullIssue' => __DIR__ . '/../..' . '/sources/Core/BulkChange/bulkchange/CellStatus_NullIssue.php',
-        'CellStatus_SearchIssue' => __DIR__ . '/../..' . '/sources/Core/BulkChange/bulkchange/CellStatus_SearchIssue.php',
-        'CellStatus_Void' => __DIR__ . '/../..' . '/sources/Core/BulkChange/bulkchange/CellStatus_Void.php',
+        'CellChangeSpec' => __DIR__ . '/../..' . '/sources/Core/BulkChange/CellChangeSpec.php',
+        'CellStatus_Ambiguous' => __DIR__ . '/../..' . '/sources/Core/BulkChange/CellStatus_Ambiguous.php',
+        'CellStatus_Issue' => __DIR__ . '/../..' . '/sources/Core/BulkChange/CellStatus_Issue.php',
+        'CellStatus_Modify' => __DIR__ . '/../..' . '/sources/Core/BulkChange/CellStatus_Modify.php',
+        'CellStatus_NullIssue' => __DIR__ . '/../..' . '/sources/Core/BulkChange/CellStatus_NullIssue.php',
+        'CellStatus_SearchIssue' => __DIR__ . '/../..' . '/sources/Core/BulkChange/CellStatus_SearchIssue.php',
+        'CellStatus_Void' => __DIR__ . '/../..' . '/sources/Core/BulkChange/CellStatus_Void.php',
         'CharConcatExpression' => __DIR__ . '/../..' . '/core/oql/expression.class.inc.php',
         'CharConcatWSExpression' => __DIR__ . '/../..' . '/core/oql/expression.class.inc.php',
-        'CheckStopWatchThresholds' => __DIR__ . '/../..' . '/core/ormstopwatch.class.inc.php',
+        'CheckStopWatchThresholds' => __DIR__ . '/../..' . '/sources/Core/Orm/ormStopWatch.php',
         'CheckableExpression' => __DIR__ . '/../..' . '/core/oql/oqlquery.class.inc.php',
         'Combodo\\iTop\\Application\\Branding' => __DIR__ . '/../..' . '/sources/Application/Branding.php',
         'Combodo\\iTop\\Application\\EventRegister\\ApplicationEvents' => __DIR__ . '/../..' . '/sources/Application/EventRegister/ApplicationEvents.php',
@@ -800,7 +800,7 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'Combodo\\iTop\\Core\\Kpi\\KpiLogData' => __DIR__ . '/../..' . '/sources/Core/Kpi/KpiLogData.php',
         'Combodo\\iTop\\Core\\MetaModel\\FriendlyNameType' => __DIR__ . '/../..' . '/sources/Core/MetaModel/FriendlyNameType.php',
         'Combodo\\iTop\\Core\\MetaModel\\HierarchicalKey' => __DIR__ . '/../..' . '/sources/Core/MetaModel/HierarchicalKey.php',
-        'Combodo\\iTop\\Core\\Trigger\\Enum\\SubscriptionPolicy' => __DIR__ . '/../..' . '/sources/Core/TriggerAndAction/Enum/SubscriptionPolicy.php',
+        'Combodo\\iTop\\Core\\Trigger\\Enum\\SubscriptionPolicy' => __DIR__ . '/../..' . '/sources/Core/Trigger/Enum/SubscriptionPolicy.php',
         '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',
@@ -1002,7 +1002,7 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'EventOnObject' => __DIR__ . '/../..' . '/sources/Application/DataModel/Event/EventOnObject.php',
         'EventRestService' => __DIR__ . '/../..' . '/sources/Application/DataModel/Event/EventRestService.php',
         'EventWebService' => __DIR__ . '/../..' . '/sources/Application/DataModel/Event/EventWebService.php',
-        'ExcelBulkExport' => __DIR__ . '/../..' . '/core/excelbulkexport.class.inc.php',
+        'ExcelBulkExport' => __DIR__ . '/../..' . '/sources/Application/BulkExport/ExcelBulkExport.php',
         'ExcelExporter' => __DIR__ . '/../..' . '/application/excelexporter.class.inc.php',
         'ExceptionLog' => __DIR__ . '/../..' . '/core/log.class.inc.php',
         'ExecAsyncTask' => __DIR__ . '/../..' . '/sources/Core/DataModel/AsyncTask/ExecAsyncTask.php',
@@ -1116,7 +1116,7 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'GuzzleHttp\\RetryMiddleware' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/RetryMiddleware.php',
         'GuzzleHttp\\TransferStats' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/TransferStats.php',
         'GuzzleHttp\\Utils' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/Utils.php',
-        'HTMLBulkExport' => __DIR__ . '/../..' . '/core/htmlbulkexport.class.inc.php',
+        'HTMLBulkExport' => __DIR__ . '/../..' . '/sources/Application/BulkExport/HTMLBulkExport.php',
         'HTMLDOMSanitizer' => __DIR__ . '/../..' . '/core/htmlsanitizer.class.inc.php',
         'HTMLNullSanitizer' => __DIR__ . '/../..' . '/core/htmlsanitizer.class.inc.php',
         'HTMLSanitizer' => __DIR__ . '/../..' . '/core/htmlsanitizer.class.inc.php',
@@ -1548,7 +1548,7 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'OqlUnionQuery' => __DIR__ . '/../..' . '/core/oql/oqlquery.class.inc.php',
         'Override' => __DIR__ . '/..' . '/symfony/polyfill-php83/Resources/stubs/Override.php',
         'PDF417' => __DIR__ . '/..' . '/tecnickcom/tcpdf/include/barcodes/pdf417.php',
-        'PDFBulkExport' => __DIR__ . '/../..' . '/core/pdfbulkexport.class.inc.php',
+        'PDFBulkExport' => __DIR__ . '/../..' . '/sources/Application/BulkExport/PDFBulkExport.php',
         'PEAR' => __DIR__ . '/..' . '/pear/pear-core-minimal/src/PEAR.php',
         'PEAR_ErrorStack' => __DIR__ . '/..' . '/pear/pear-core-minimal/src/PEAR/ErrorStack.php',
         'PEAR_Exception' => __DIR__ . '/..' . '/pear/pear_exception/PEAR/Exception.php',
@@ -1884,7 +1884,7 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'RelationObjectNode' => __DIR__ . '/../..' . '/sources/Core/RelationGraph/RelationObjectNode.php',
         'RelationRedundancyNode' => __DIR__ . '/../..' . '/sources/Core/RelationGraph/RelationRedundancyNode.php',
         'RelationTypeIterator' => __DIR__ . '/../..' . '/core/simplegraph.class.inc.php',
-        'ReportValue' => __DIR__ . '/../..' . '/sources/Core/BulkChange/bulkchange/ReportValue.php',
+        'ReportValue' => __DIR__ . '/../..' . '/sources/Core/BulkChange/ReportValue.php',
         'RestDelete' => __DIR__ . '/../..' . '/core/restservices.class.inc.php',
         'RestResult' => __DIR__ . '/../..' . '/application/applicationextension/rest/RestResult.php',
         'RestResultWithObjects' => __DIR__ . '/../..' . '/core/restservices.class.inc.php',
@@ -1892,13 +1892,13 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'RestUtils' => __DIR__ . '/../..' . '/application/applicationextension/rest/RestUtils.php',
         'ReturnTypeWillChange' => __DIR__ . '/..' . '/symfony/polyfill-php81/Resources/stubs/ReturnTypeWillChange.php',
         'RotatingLogFileNameBuilder' => __DIR__ . '/../..' . '/core/log.class.inc.php',
-        'RowStatus' => __DIR__ . '/../..' . '/sources/Core/BulkChange/bulkchange/RowStatus.php',
-        'RowStatus_Disappeared' => __DIR__ . '/../..' . '/sources/Core/BulkChange/bulkchange/RowStatus_Disappeared.php',
-        'RowStatus_Error' => __DIR__ . '/../..' . '/sources/Core/BulkChange/bulkchange/RowStatus_Error.php',
-        'RowStatus_Issue' => __DIR__ . '/../..' . '/sources/Core/BulkChange/bulkchange/RowStatus_Issue.php',
-        'RowStatus_Modify' => __DIR__ . '/../..' . '/sources/Core/BulkChange/bulkchange/RowStatus_Modify.php',
-        'RowStatus_NewObj' => __DIR__ . '/../..' . '/sources/Core/BulkChange/bulkchange/RowStatus_NewObj.php',
-        'RowStatus_NoChange' => __DIR__ . '/../..' . '/sources/Core/BulkChange/bulkchange/RowStatus_NoChange.php',
+        'RowStatus' => __DIR__ . '/../..' . '/sources/Core/BulkChange/RowStatus.php',
+        'RowStatus_Disappeared' => __DIR__ . '/../..' . '/sources/Core/BulkChange/RowStatus_Disappeared.php',
+        'RowStatus_Error' => __DIR__ . '/../..' . '/sources/Core/BulkChange/RowStatus_Error.php',
+        'RowStatus_Issue' => __DIR__ . '/../..' . '/sources/Core/BulkChange/RowStatus_Issue.php',
+        'RowStatus_Modify' => __DIR__ . '/../..' . '/sources/Core/BulkChange/RowStatus_Modify.php',
+        'RowStatus_NewObj' => __DIR__ . '/../..' . '/sources/Core/BulkChange/RowStatus_NewObj.php',
+        'RowStatus_NoChange' => __DIR__ . '/../..' . '/sources/Core/BulkChange/RowStatus_NoChange.php',
         'RunTimeIconSelectionField' => __DIR__ . '/../..' . '/application/forms.class.inc.php',
         'RuntimeDashboard' => __DIR__ . '/../..' . '/application/dashboard.class.inc.php',
         'SQLExpression' => __DIR__ . '/../..' . '/core/oql/expression.class.inc.php',
@@ -2018,7 +2018,7 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'SimpleGraphException' => __DIR__ . '/../..' . '/core/simplegraph.class.inc.php',
         'Soundasleep\\Html2Text' => __DIR__ . '/..' . '/soundasleep/html2text/src/Html2Text.php',
         'Soundasleep\\Html2TextException' => __DIR__ . '/..' . '/soundasleep/html2text/src/Html2TextException.php',
-        'SpreadsheetBulkExport' => __DIR__ . '/../..' . '/core/spreadsheetbulkexport.class.inc.php',
+        'SpreadsheetBulkExport' => __DIR__ . '/../..' . '/sources/Application/BulkExport/SpreadsheetBulkExport.php',
         'StimulusChecker' => __DIR__ . '/../..' . '/core/userrights.class.inc.php',
         'StimulusInternal' => __DIR__ . '/../..' . '/core/stimulus.class.inc.php',
         'StimulusUserAction' => __DIR__ . '/../..' . '/core/stimulus.class.inc.php',
@@ -3294,7 +3294,7 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'TCPDF_IMPORT' => __DIR__ . '/..' . '/tecnickcom/tcpdf/tcpdf_import.php',
         'TCPDF_PARSER' => __DIR__ . '/..' . '/tecnickcom/tcpdf/tcpdf_parser.php',
         'TCPDF_STATIC' => __DIR__ . '/..' . '/tecnickcom/tcpdf/include/tcpdf_static.php',
-        'TabularBulkExport' => __DIR__ . '/../..' . '/core/tabularbulkexport.class.inc.php',
+        'TabularBulkExport' => __DIR__ . '/../..' . '/sources/Application/BulkExport/TabularBulkExport.php',
         'TagSetFieldData' => __DIR__ . '/../..' . '/sources/Core/DataModel/TagSetFieldData.php',
         'TemplateMenuNode' => __DIR__ . '/../..' . '/application/menunode.class.inc.php',
         'TemplateString' => __DIR__ . '/../..' . '/core/templatestring.class.inc.php',
@@ -3559,7 +3559,7 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'WeeklyRotatingLogFileNameBuilder' => __DIR__ . '/../..' . '/core/log.class.inc.php',
         'WizardHelper' => __DIR__ . '/../..' . '/application/wizardhelper.class.inc.php',
         'XLSXWriter' => __DIR__ . '/../..' . '/application/xlsxwriter.class.php',
-        'XMLBulkExport' => __DIR__ . '/../..' . '/core/xmlbulkexport.class.inc.php',
+        'XMLBulkExport' => __DIR__ . '/../..' . '/sources/Application/BulkExport/XMLBulkExport.php',
         'appUserPreferences' => __DIR__ . '/../..' . '/application/user.preferences.class.inc.php',
         'cmdbAbstractObject' => __DIR__ . '/../..' . '/application/cmdbabstract.class.inc.php',
         'cmdbDataGenerator' => __DIR__ . '/../..' . '/core/data.generator.class.inc.php',
@@ -3613,15 +3613,15 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'iWorkingTimeComputer' => __DIR__ . '/../..' . '/core/computing.inc.php',
         'lnkAuditCategoryToAuditDomain' => __DIR__ . '/../..' . '/application/audit.domain.class.inc.php',
         'lnkTriggerAction' => __DIR__ . '/../..' . '/sources/Application/DataModel/TriggerAndAction/lnkTriggerAction.php',
-        'ormCaseLog' => __DIR__ . '/../..' . '/core/ormcaselog.class.inc.php',
-        'ormCustomFieldsValue' => __DIR__ . '/../..' . '/core/ormcustomfieldsvalue.class.inc.php',
-        'ormDocument' => __DIR__ . '/../..' . '/core/ormdocument.class.inc.php',
-        'ormLinkSet' => __DIR__ . '/../..' . '/core/ormlinkset.class.inc.php',
-        'ormPassword' => __DIR__ . '/../..' . '/core/ormpassword.class.inc.php',
-        'ormSet' => __DIR__ . '/../..' . '/core/ormset.class.inc.php',
-        'ormStopWatch' => __DIR__ . '/../..' . '/core/ormstopwatch.class.inc.php',
-        'ormStyle' => __DIR__ . '/../..' . '/core/ormStyle.class.inc.php',
-        'ormTagSet' => __DIR__ . '/../..' . '/core/ormtagset.class.inc.php',
+        'ormCaseLog' => __DIR__ . '/../..' . '/sources/Core/Orm/ormCaseLog.php',
+        'ormCustomFieldsValue' => __DIR__ . '/../..' . '/sources/Core/Orm/ormCustomFieldsValue.php',
+        'ormDocument' => __DIR__ . '/../..' . '/sources/Core/Orm/ormDocument.php',
+        'ormLinkSet' => __DIR__ . '/../..' . '/sources/Core/Orm/ormLinkSet.php',
+        'ormPassword' => __DIR__ . '/../..' . '/sources/Core/Orm/ormPassword.php',
+        'ormSet' => __DIR__ . '/../..' . '/sources/Core/Orm/ormSet.php',
+        'ormStopWatch' => __DIR__ . '/../..' . '/sources/Core/Orm/ormStopWatch.php',
+        'ormStyle' => __DIR__ . '/../..' . '/sources/Core/Orm/ormStyle.php',
+        'ormTagSet' => __DIR__ . '/../..' . '/sources/Core/Orm/ormTagSet.php',
         'phpCAS' => __DIR__ . '/..' . '/apereo/phpcas/source/CAS.php',
         'privUITransaction' => __DIR__ . '/../..' . '/application/transaction.class.inc.php',
         'privUITransactionFile' => __DIR__ . '/../..' . '/application/transaction.class.inc.php',
diff --git a/sources/Core/Orm/ormcaselog.class.inc.php b/sources/Core/Orm/ormCaseLog.php
similarity index 100%
rename from sources/Core/Orm/ormcaselog.class.inc.php
rename to sources/Core/Orm/ormCaseLog.php
diff --git a/sources/Core/Orm/ormcustomfieldsvalue.class.inc.php b/sources/Core/Orm/ormCustomFieldsValue.php
similarity index 100%
rename from sources/Core/Orm/ormcustomfieldsvalue.class.inc.php
rename to sources/Core/Orm/ormCustomFieldsValue.php
diff --git a/sources/Core/Orm/ormdocument.class.inc.php b/sources/Core/Orm/ormDocument.php
similarity index 100%
rename from sources/Core/Orm/ormdocument.class.inc.php
rename to sources/Core/Orm/ormDocument.php
diff --git a/sources/Core/Orm/ormlinkset.class.inc.php b/sources/Core/Orm/ormLinkSet.php
similarity index 99%
rename from sources/Core/Orm/ormlinkset.class.inc.php
rename to sources/Core/Orm/ormLinkSet.php
index b875fe0b6..36f786730 100644
--- a/sources/Core/Orm/ormlinkset.class.inc.php
+++ b/sources/Core/Orm/ormLinkSet.php
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Affero General Public License
  */
 
-require_once('dbobjectiterator.php');
+require_once(APPROOT.'core/dbobjectiterator.php');
 
 
 /**
diff --git a/sources/Core/Orm/ormpassword.class.inc.php b/sources/Core/Orm/ormPassword.php
similarity index 100%
rename from sources/Core/Orm/ormpassword.class.inc.php
rename to sources/Core/Orm/ormPassword.php
diff --git a/sources/Core/Orm/ormset.class.inc.php b/sources/Core/Orm/ormSet.php
similarity index 100%
rename from sources/Core/Orm/ormset.class.inc.php
rename to sources/Core/Orm/ormSet.php
diff --git a/sources/Core/Orm/ormstopwatch.class.inc.php b/sources/Core/Orm/ormStopWatch.php
similarity index 99%
rename from sources/Core/Orm/ormstopwatch.class.inc.php
rename to sources/Core/Orm/ormStopWatch.php
index f8e38da0f..c1188997e 100644
--- a/sources/Core/Orm/ormstopwatch.class.inc.php
+++ b/sources/Core/Orm/ormStopWatch.php
@@ -16,7 +16,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/>
 
-require_once('backgroundprocess.inc.php');
+require_once(APPROOT.'core/backgroundprocess.inc.php');
 
 /**
  * ormStopWatch
diff --git a/sources/Core/Orm/ormStyle.class.inc.php b/sources/Core/Orm/ormStyle.php
similarity index 100%
rename from sources/Core/Orm/ormStyle.class.inc.php
rename to sources/Core/Orm/ormStyle.php
diff --git a/sources/Core/Orm/ormtagset.class.inc.php b/sources/Core/Orm/ormTagSet.php
similarity index 100%
rename from sources/Core/Orm/ormtagset.class.inc.php
rename to sources/Core/Orm/ormTagSet.php