diff --git a/core/action.class.inc.php b/core/action.class.inc.php
deleted file mode 100644
index e8a445d30..000000000
--- a/core/action.class.inc.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-// Copyright (C) 2010-2024 Combodo SAS
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   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\TwigBase\Twig\TwigHelper;
-use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableUIBlockFactory;
-use Combodo\iTop\Application\WebPage\WebPage;
-use Combodo\iTop\Service\Notification\NotificationsRepository;
-use Combodo\iTop\Service\Notification\NotificationsService;
-use Combodo\iTop\Service\Router\Router;
-
-/**
- * Persistent classes (internal): user defined actions
- *
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-require_once(APPROOT.'/core/asynctask.class.inc.php');
-require_once(APPROOT.'/core/email.class.inc.php');
-//Actions
-require_once(APPROOT.'/core/action/Action.php');
-require_once(APPROOT.'/core/action/ActionNotification.php');
-require_once(APPROOT.'/core/action/ActionEmail.php');
diff --git a/core/asynctask.class.inc.php b/core/asynctask.class.inc.php
deleted file mode 100644
index 4dfd5d63f..000000000
--- a/core/asynctask.class.inc.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-// Copyright (C) 2010-2024 Combodo SAS
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   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\Service\Notification\Event\EventNotificationNewsroomService;
-/**
- * Persistent classes (internal): user defined actions
- *
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-require_once(APPROOT.'/core/asynctask/ExecAsyncTask.php');
-require_once(APPROOT.'/core/asynctask/AsyncTask.php');
-require_once(APPROOT.'/core/asynctask/AsyncSendEmail.php');
-require_once(APPROOT.'/core/asynctask/ExecAsyncTask.php');
-require_once(APPROOT.'/core/asynctask/AsyncSendNewsroom.php');
-
-
diff --git a/core/attributedef.class.inc.php b/core/attributedef.class.inc.php
index a92337f91..951e45c7e 100644
--- a/core/attributedef.class.inc.php
+++ b/core/attributedef.class.inc.php
@@ -29,153 +29,69 @@ require_once('ormcustomfieldsvalue.class.inc.php');
 require_once('datetimeformat.class.inc.php');
 
 
-require_once(APPROOT.'core/attributedef/MissingColumnException.php');
-require_once(APPROOT.'core/attributedef/iAttributeNoGroupBy.php');
-require_once(APPROOT.'core/attributedef/AttributeDefinition.php');
-require_once(APPROOT.'core/attributedef/AttributeDashboard.php');
-require_once(APPROOT.'core/attributedef/AttributeLinkedSet.php');
-require_once(APPROOT.'core/attributedef/AttributeLinkedSetIndirect.php');
-require_once(APPROOT.'core/attributedef/AttributeDBFieldVoid.php');
-require_once(APPROOT.'core/attributedef/AttributeDBField.php');
-require_once(APPROOT.'core/attributedef/AttributeInteger.php');
-require_once(APPROOT.'core/attributedef/AttributeObjectKey.php');
-require_once(APPROOT.'core/attributedef/AttributePercentage.php');
-require_once(APPROOT.'core/attributedef/AttributeDecimal.php');
-require_once(APPROOT.'core/attributedef/AttributeBoolean.php');
-require_once(APPROOT.'core/attributedef/AttributeString.php');
-require_once(APPROOT.'core/attributedef/AttributeClass.php');
-require_once(APPROOT.'core/attributedef/AttributeClassState.php');
-require_once(APPROOT.'core/attributedef/AttributeApplicationLanguage.php');
-require_once(APPROOT.'core/attributedef/AttributeFinalClass.php');
-require_once(APPROOT.'core/attributedef/AttributePassword.php');
-require_once(APPROOT.'core/attributedef/AttributeEncryptedString.php');
-require_once(APPROOT.'core/attributedef/AttributeText.php');
-require_once(APPROOT.'core/attributedef/AttributeLongText.php');
-require_once(APPROOT.'core/attributedef/AttributeCaseLog.php');
-require_once(APPROOT.'core/attributedef/AttributeHTML.php');
-require_once(APPROOT.'core/attributedef/AttributeEmailAddress.php');
-require_once(APPROOT.'core/attributedef/AttributeIPAddress.php');
-require_once(APPROOT.'core/attributedef/AttributePhoneNumber.php');
-require_once(APPROOT.'core/attributedef/AttributeOQL.php');
-require_once(APPROOT.'core/attributedef/AttributeTemplateString.php');
-require_once(APPROOT.'core/attributedef/AttributeTemplateText.php');
-require_once(APPROOT.'core/attributedef/AttributeTemplateHTML.php');
-require_once(APPROOT.'core/attributedef/AttributeEnum.php');
-require_once(APPROOT.'core/attributedef/AttributeMetaEnum.php');
-require_once(APPROOT.'core/attributedef/AttributeDateTime.php');
-require_once(APPROOT.'core/attributedef/AttributeDuration.php');
-require_once(APPROOT.'core/attributedef/AttributeDate.php');
-require_once(APPROOT.'core/attributedef/AttributeDeadline.php');
-require_once(APPROOT.'core/attributedef/AttributeExternalKey.php');
-require_once(APPROOT.'core/attributedef/AttributeHierarchicalKey.php');
-require_once(APPROOT.'core/attributedef/AttributeExternalField.php');
-require_once(APPROOT.'core/attributedef/AttributeURL.php');
-require_once(APPROOT.'core/attributedef/AttributeBlob.php');
-require_once(APPROOT.'core/attributedef/AttributeImage.php');
-require_once(APPROOT.'core/attributedef/AttributeStopWatch.php');
-require_once(APPROOT.'core/attributedef/AttributeSubItem.php');
-require_once(APPROOT.'core/attributedef/AttributeOneWayPassword.php');
-require_once(APPROOT.'core/attributedef/AttributeTable.php');
-require_once(APPROOT.'core/attributedef/AttributePropertySet.php');
-require_once(APPROOT.'core/attributedef/AttributeSet.php');
-require_once(APPROOT.'core/attributedef/AttributeEnumSet.php');
-require_once(APPROOT.'core/attributedef/AttributeClassAttCodeSet.php');
-require_once(APPROOT.'core/attributedef/AttributeQueryAttCodeSet.php');
-require_once(APPROOT.'core/attributedef/AttributeTagSet.php');
-require_once(APPROOT.'core/attributedef/AttributeFriendlyName.php');
-require_once(APPROOT.'core/attributedef/AttributeRedundancySettings.php');
-require_once(APPROOT.'core/attributedef/AttributeObsolescenceDate.php');
-require_once(APPROOT.'core/attributedef/AttributeCustomFields.php');
-require_once(APPROOT.'core/attributedef/AttributeArchiveFlag.php');
-require_once(APPROOT.'core/attributedef/AttributeArchiveDate.php');
-require_once(APPROOT.'core/attributedef/AttributeObsolescenceFlag.php');
-require_once(APPROOT.'core/attributedef/AttributeObsolescenceDate.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/MissingColumnException.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/iAttributeNoGroupBy.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeDefinition.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeDashboard.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeLinkedSet.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeLinkedSetIndirect.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeDBFieldVoid.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeDBField.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeInteger.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeObjectKey.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributePercentage.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeDecimal.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeBoolean.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeString.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeClass.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeClassState.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeApplicationLanguage.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeFinalClass.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributePassword.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeEncryptedString.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeText.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeLongText.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeCaseLog.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeHTML.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeEmailAddress.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeIPAddress.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributePhoneNumber.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeOQL.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeTemplateString.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeTemplateText.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeTemplateHTML.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeEnum.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeMetaEnum.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeDateTime.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeDuration.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeDate.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeDeadline.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeExternalKey.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeHierarchicalKey.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeExternalField.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeURL.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeBlob.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeImage.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeStopWatch.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeSubItem.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeOneWayPassword.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeTable.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributePropertySet.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeSet.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeEnumSet.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeClassAttCodeSet.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeQueryAttCodeSet.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeTagSet.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeFriendlyName.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeRedundancySettings.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeObsolescenceDate.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeCustomFields.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeArchiveFlag.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeArchiveDate.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeObsolescenceFlag.php');
+require_once(APPROOT.'/sources/Core/AttributeDefinition/AttributeObsolescenceDate.php');
 
 
-/**
- * add some description here...
- *
- * @package     iTopORM
- */
-define('EXTKEY_RELATIVE', 1);
-
-/**
- * add some description here...
- *
- * @package     iTopORM
- */
-define('EXTKEY_ABSOLUTE', 2);
-
-/**
- * Propagation of the deletion through an external key - ask the user to delete the referencing object
- *
- * @package     iTopORM
- */
-define('DEL_MANUAL', 1);
-
-/**
- * Propagation of the deletion through an external key - remove linked objects if ext key has is_null_allowed=false
- *
- * @package     iTopORM
- */
-define('DEL_AUTO', 2);
-/**
- * Fully silent delete... not yet implemented
- */
-define('DEL_SILENT', 2);
-/**
- * For HierarchicalKeys only: move all the children up one level automatically
- */
-define('DEL_MOVEUP', 3);
-
-/**
- * Do nothing at least automatically
- */
-define('DEL_NONE', 4);
-
-
-/**
- * For Link sets: tracking_level
- *
- * @package     iTopORM
- */
-define('ATTRIBUTE_TRACKING_NONE', 0); // Do not track changes of the attribute
-define('ATTRIBUTE_TRACKING_ALL', 3); // Do track all changes of the attribute
-define('LINKSET_TRACKING_NONE', 0); // Do not track changes in the link set
-define('LINKSET_TRACKING_LIST', 1); // Do track added/removed items
-define('LINKSET_TRACKING_DETAILS', 2); // Do track modified items
-define('LINKSET_TRACKING_ALL', 3); // Do track added/removed/modified items
-
-define('LINKSET_EDITMODE_NONE', 0); // The linkset cannot be edited at all from inside this object
-define('LINKSET_EDITMODE_ADDONLY', 1); // The only possible action is to open a new window to create a new object
-define('LINKSET_EDITMODE_ACTIONS', 2); // Show the usual 'Actions' popup menu
-define('LINKSET_EDITMODE_INPLACE', 3); // The "linked" objects can be created/modified/deleted in place
-define('LINKSET_EDITMODE_ADDREMOVE', 4); // The "linked" objects can be added/removed in place
-
-define('LINKSET_EDITWHEN_NEVER', 0); // The linkset cannot be edited at all from inside this object
-define('LINKSET_EDITWHEN_ON_HOST_EDITION', 1); // The only possible action is to open a new window to create a new object
-define('LINKSET_EDITWHEN_ON_HOST_DISPLAY', 2); // Show the usual 'Actions' popup menu
-define('LINKSET_EDITWHEN_ALWAYS', 3); // Show the usual 'Actions' popup menu
-
-
-define('LINKSET_DISPLAY_STYLE_PROPERTY', 'property');
-define('LINKSET_DISPLAY_STYLE_TAB', 'tab');
-
-
-/**
- * Wiki formatting - experimental
- *
- * [[<objClass>:<objName|objId>|<label>]]
- * <label> is optional
- *
- * Examples:
- * - [[Server:db1.tnut.com]]
- * - [[Server:123]]
- * - [[Server:db1.tnut.com|Production server]]
- * - [[Server:123|Production server]]
- */
-define('WIKI_OBJECT_REGEXP', '/\[\[(.+):(.+)(\|(.+))?\]\]/U');
-
 
 // Indexed array having two dimensions
 
diff --git a/core/autoload.php b/core/autoload.php
index 026fc3764..149999ccd 100644
--- a/core/autoload.php
+++ b/core/autoload.php
@@ -26,26 +26,54 @@ MetaModel::IncludeModule('application/query.class.inc.php');
 MetaModel::IncludeModule('setup/moduleinstallation.class.inc.php');
 
 
-//MetaModel::IncludeModule('core/event.class.inc.php');
-MetaModel::IncludeModule('core/event/Event.php');
-MetaModel::IncludeModule('core/event/EventNotification.php');
-MetaModel::IncludeModule('core/event/EventNotificationEmail.php');
-MetaModel::IncludeModule('core/event/EventIssue.php');
-MetaModel::IncludeModule('core/event/EventWebService.php');
-MetaModel::IncludeModule('core/event/EventRestService.php');
-MetaModel::IncludeModule('core/event/EventLoginUsage.php');
-MetaModel::IncludeModule('core/event/EventOnObject.php');
+MetaModel::IncludeModule(APPROOT.'/sources/Application/DataModel/Event/Event.php');
+MetaModel::IncludeModule(APPROOT.'/sources/Application/DataModel/Event/EventNotification.php');
+MetaModel::IncludeModule(APPROOT.'/sources/Application/DataModel/Event/EventNotificationEmail.php');
+MetaModel::IncludeModule(APPROOT.'/sources/Application/DataModel/Event/EventIssue.php');
+MetaModel::IncludeModule(APPROOT.'/sources/Application/DataModel/Event/EventWebService.php');
+MetaModel::IncludeModule(APPROOT.'/sources/Application/DataModel/Event/EventRestService.php');
+MetaModel::IncludeModule(APPROOT.'/sources/Application/DataModel/Event/EventLoginUsage.php');
+MetaModel::IncludeModule(APPROOT.'/sources/Application/DataModel/Event/EventOnObject.php');
+
+MetaModel::IncludeModule(APPROOT.'/sources/Core/DataModel/AsyncTask/ExecAsyncTask.php');
+MetaModel::IncludeModule(APPROOT.'/sources/Core/DataModel/AsyncTask/AsyncTask.php');
+MetaModel::IncludeModule(APPROOT.'/sources/Core/DataModel/AsyncTask/AsyncSendEmail.php');
+MetaModel::IncludeModule(APPROOT.'/sources/Core/DataModel/AsyncTask/ExecAsyncTask.php');
+MetaModel::IncludeModule(APPROOT.'/sources/Core/DataModel/AsyncTask/AsyncSendNewsroom.php');
+
+MetaModel::IncludeModule(APPROOT.'/core/email.class.inc.php');
+
+MetaModel::IncludeModule(APPROOT.'/sources/Application/DataModel/TriggerAndAction/Action.php');
+MetaModel::IncludeModule(APPROOT.'/sources/Application/DataModel/TriggerAndAction/ActionNotification.php');
+MetaModel::IncludeModule(APPROOT.'/sources/Application/DataModel/TriggerAndAction/ActionEmail.php');
+MetaModel::IncludeModule(APPROOT.'/sources/Application/DataModel/TriggerAndAction/lnkTriggerAction.php');
+MetaModel::IncludeModule(APPROOT.'/sources/Application/DataModel/TriggerAndAction/Trigger.php');
+MetaModel::IncludeModule(APPROOT.'/sources/Application/DataModel/TriggerAndAction/TriggerOnAttributeBlobDownload.php');
+MetaModel::IncludeModule(APPROOT.'/sources/Application/DataModel/TriggerAndAction/TriggerOnObject.php');
+MetaModel::IncludeModule(APPROOT.'/sources/Application/DataModel/TriggerAndAction/TriggerOnObjectCreate.php');
+MetaModel::IncludeModule(APPROOT.'/sources/Application/DataModel/TriggerAndAction/TriggerOnObjectDelete.php');
+MetaModel::IncludeModule(APPROOT.'/sources/Application/DataModel/TriggerAndAction/TriggerOnObjectMention.php');
+MetaModel::IncludeModule(APPROOT.'/sources/Application/DataModel/TriggerAndAction/TriggerOnObjectUpdate.php');
+MetaModel::IncludeModule(APPROOT.'/sources/Application/DataModel/TriggerAndAction/TriggerOnPortalUpdate.php');
+MetaModel::IncludeModule(APPROOT.'/sources/Application/DataModel/TriggerAndAction/TriggerOnStateChange.php');
+MetaModel::IncludeModule(APPROOT.'/sources/Application/DataModel/TriggerAndAction/TriggerOnStateEnter.php');
+MetaModel::IncludeModule(APPROOT.'/sources/Application/DataModel/TriggerAndAction/TriggerOnStateLeave.php');
+MetaModel::IncludeModule(APPROOT.'/sources/Application/DataModel/TriggerAndAction/TriggerOnThresholdReached.php');
+
+//MetaModel::IncludeModule('core/bulkexport.class.inc.php');
+MetaModel::IncludeModule(APPROOT.'/sources/Application/BulkExport/BulkExport.php');
+MetaModel::IncludeModule(APPROOT.'/sources/Application/BulkExport/BulkExportException.php');
+MetaModel::IncludeModule(APPROOT.'/sources/Application/BulkExport/BulkExportMissingParameterException.php');
+MetaModel::IncludeModule(APPROOT.'/sources/Application/BulkExport/BulkExportResultGC.php');
 
-MetaModel::IncludeModule('core/action.class.inc.php');
-MetaModel::IncludeModule('core/trigger.class.inc.php');
-MetaModel::IncludeModule('core/bulkexport.class.inc.php');
 MetaModel::IncludeModule('core/ownershiplock.class.inc.php');
-MetaModel::IncludeModule('core/tagsetfield.class.inc.php');
+MetaModel::IncludeModule(APPROOT.'/sources/Core/DataModel/TagSetFieldData.php');
 MetaModel::IncludeModule('synchro/synchrodatasource.class.inc.php');
-MetaModel::IncludeModule('core/backgroundtask.class.inc.php');
+MetaModel::IncludeModule(APPROOT.'/sources/Core/DataModel/BackgroundTask.php');
 MetaModel::IncludeModule('core/inlineimage.class.inc.php');
-MetaModel::IncludeModule('core/counter.class.inc.php');
-MetaModel::IncludeModule('core/TemporaryObjectDescriptor.php');
+//MetaModel::IncludeModule('core/counter.class.inc.php');
+MetaModel::IncludeModule(APPROOT.'/sources/Core/DataModel/KeyValueStore.php');
+MetaModel::IncludeModule(APPROOT.'/sources/Core/DataModel/TemporaryObjectDescriptor.php');
 
 MetaModel::IncludeModule('webservices/webservices.basic.php');
 
diff --git a/core/cmdbobject.class.inc.php b/core/cmdbobject.class.inc.php
index fffc65e80..b521bbd3d 100644
--- a/core/cmdbobject.class.inc.php
+++ b/core/cmdbobject.class.inc.php
@@ -40,9 +40,15 @@ require_once('dict.class.inc.php');
 
 require_once('attributedef.class.inc.php');
 require_once('stimulus.class.inc.php');
-require_once('valuesetdef.class.inc.php');
 require_once('MyHelpers.class.inc.php');
 
+require_once(APPROOT.'/sources/Core/ValueSetDefinition/ValueSetDefinition.php');
+require_once(APPROOT.'/sources/Core/ValueSetDefinition/ValueSetObjects.php');
+require_once(APPROOT.'/sources/Core/ValueSetDefinition/ValueSetEnum.php');
+require_once(APPROOT.'/sources/Core/ValueSetDefinition/ValueSetEnumPadded.php');
+require_once(APPROOT.'/sources/Core/ValueSetDefinition/ValueSetRange.php');
+require_once(APPROOT.'/sources/Core/ValueSetDefinition/ValueSetEnumClasses.php');
+
 require_once('oql/expression.class.inc.php');
 require_once('oql/oqlquery.class.inc.php');
 require_once('oql/oqlexception.class.inc.php');
@@ -59,12 +65,41 @@ require_once('dbobject.class.php');
 require_once('dbobjectset.class.php');
 
 require_once('backgroundprocess.inc.php');
-require_once('asynctask.class.inc.php');
-require_once('dbproperty.class.inc.php');
+//require_once('asynctask.class.inc.php');
+require_once(APPROOT.'/sources/Core/DataModel/AsyncTask/ExecAsyncTask.php');
+require_once(APPROOT.'/sources/Core/DataModel/AsyncTask/AsyncTask.php');
+require_once(APPROOT.'/sources/Core/DataModel/AsyncTask/AsyncSendEmail.php');
+require_once(APPROOT.'/sources/Core/DataModel/AsyncTask/ExecAsyncTask.php');
+require_once(APPROOT.'/sources/Core/DataModel/AsyncTask/AsyncSendNewsroom.php');
+
+require_once(APPROOT.'/sources/Core/DataModel/DBProperty.php');
 
 // db change tracking data model
 require_once('cmdbchange.class.inc.php');
 //require_once('cmdbchangeop.class.inc.php');
+require_once(APPROOT.'/sources/Core/DataModel/CMDBChange/iCMDBChangeOp.php');
+require_once(APPROOT.'/sources/Core/DataModel/CMDBChange/CMDBChangeOp.php');
+require_once(APPROOT.'/sources/Core/DataModel/CMDBChange/CMDBChangeOpCreate.php');
+require_once(APPROOT.'/sources/Core/DataModel/CMDBChange/CMDBChangeOpDelete.php');
+require_once(APPROOT.'/sources/Core/DataModel/CMDBChange/CMDBChangeOpPlugin.php');
+require_once(APPROOT.'/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttribute.php');
+require_once(APPROOT.'/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeBlob.php');
+require_once(APPROOT.'/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeCaseLog.php');
+require_once(APPROOT.'/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeCustomFields.php');
+require_once(APPROOT.'/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeEncrypted.php');
+require_once(APPROOT.'/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeHTML.php');
+require_once(APPROOT.'/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeLinks.php');
+require_once(APPROOT.'/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeLinksAddRemove.php');
+require_once(APPROOT.'/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeLinksTune.php');
+require_once(APPROOT.'/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeLongText.php');
+require_once(APPROOT.'/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeOneWayPassword.php');
+require_once(APPROOT.'/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeScalar.php');
+require_once(APPROOT.'/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeTagSet.php');
+require_once(APPROOT.'/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeText.php');
+require_once(APPROOT.'/sources/Core/DataModel/CMDBChange/CMDBChangeOpSetAttributeURL.php');
+
+
+
 
 // customization data model
 // Romain: temporary moved into application.inc.php (see explanations there)
diff --git a/core/config.class.inc.php b/core/config.class.inc.php
index 5c07d5483..8a504a6d8 100644
--- a/core/config.class.inc.php
+++ b/core/config.class.inc.php
@@ -49,7 +49,12 @@ define('ACCESS_READONLY', 0);
  */
 
 require_once('attributedef.class.inc.php'); // For the defines
-//require_once('simplecrypt.class.inc.php');
+require_once(APPROOT.'/sources/Application/SimpleCrypt/CryptEngine.php');
+require_once(APPROOT.'/sources/Application/SimpleCrypt/SimpleCrypt.php');
+require_once(APPROOT.'/sources/Application/SimpleCrypt/SimpleCryptMcryptEngine.php');
+require_once(APPROOT.'/sources/Application/SimpleCrypt/SimpleCryptOpenSSLEngine.php');
+require_once(APPROOT.'/sources/Application/SimpleCrypt/SimpleCryptOpenSSLMcryptCompatibilityEngine.php');
+require_once(APPROOT.'/sources/Application/SimpleCrypt/SimpleCryptSimpleEngine.php');
 
 // was utf8 but it only supports BMP chars (https://dev.mysql.com/doc/refman/5.5/en/charset-unicode-utf8mb4.html)
 // so we switched to utf8mb4 in iTop 2.5, adding dependency to MySQL 5.5.3
diff --git a/core/metamodel.class.php b/core/metamodel.class.php
index 6c8dbce27..b6bbdeeaa 100644
--- a/core/metamodel.class.php
+++ b/core/metamodel.class.php
@@ -27,6 +27,13 @@ require_once APPROOT.'core/querymodifier.class.inc.php';
 require_once APPROOT.'core/metamodelmodifier.inc.php';
 require_once APPROOT.'core/computing.inc.php';
 //require_once APPROOT.'core/relationgraph.class.inc.php';
+require_once(APPROOT.'/sources/Core/RelationGraph/RelationEdge.php');
+require_once(APPROOT.'/sources/Core/RelationGraph/RelationGraph.php');
+require_once(APPROOT.'/sources/Core/RelationGraph/RelationObjectNode.php');
+require_once(APPROOT.'/sources/Core/RelationGraph/RelationRedundancyNode.php');
+
+
+
 require_once APPROOT.'core/apc-compat.php';
 require_once APPROOT.'core/expressioncache.class.inc.php';
 
diff --git a/core/valuesetdef.class.inc.php b/core/valuesetdef.class.inc.php
deleted file mode 100644
index cf725114a..000000000
--- a/core/valuesetdef.class.inc.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-// Copyright (C) 2010-2024 Combodo SAS
-//
-//   This file is part of iTop.
-//
-//   iTop is free software; you can redistribute it and/or modify	
-//   it under the terms of the GNU Affero General Public License as published by
-//   the Free Software Foundation, either version 3 of the License, or
-//   (at your option) any later version.
-//
-//   iTop is distributed in the hope that it will be useful,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//   GNU Affero General Public License for more details.
-//
-//   You should have received a copy of the GNU Affero General Public License
-//   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
-/**
- * Value set definitions (from a fixed list or from a query, etc.)
- *
- * @copyright   Copyright (C) 2010-2024 Combodo SAS
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-use Combodo\iTop\Core\MetaModel\FriendlyNameType;
-
-require_once('MyHelpers.class.inc.php');
-
-require_once(APPROOT.'core/valuesetdef/ValueSetDefinition.php');
-require_once(APPROOT.'core/valuesetdef/ValueSetObjects.php');
-require_once(APPROOT.'core/valuesetdef/ValueSetEnum.php');
-require_once(APPROOT.'core/valuesetdef/ValueSetEnumPadded.php');
-require_once(APPROOT.'core/valuesetdef/ValueSetRange.php');
-require_once(APPROOT.'core/valuesetdef/ValueSetEnumClasses.php');
diff --git a/pages/UI.php b/pages/UI.php
index 8b1680c7a..efdc358ed 100644
--- a/pages/UI.php
+++ b/pages/UI.php
@@ -1397,7 +1397,10 @@ try
 			case 'swf_navigator': /** @deprecated SWF was removed in iTop */
 			case 'view_relations': // Graphical display of the relations "impact" / "depends on"
 			require_once(APPROOT.'core/simplegraph.class.inc.php');
-			//require_once(APPROOT.'core/relationgraph.class.inc.php');
+			require_once(APPROOT.'/sources/Core/RelationGraph/RelationEdge.php');
+			require_once(APPROOT.'/sources/Core/RelationGraph/RelationGraph.php');
+			require_once(APPROOT.'/sources/Core/RelationGraph/RelationObjectNode.php');
+			require_once(APPROOT.'/sources/Core/RelationGraph/RelationRedundancyNode.php');
 			require_once(APPROOT.'core/displayablegraph.class.inc.php');
 			$sClass = utils::ReadParam('class', '', false, 'class');
 			$id = utils::ReadParam('id', 0);
diff --git a/pages/ajax.render.php b/pages/ajax.render.php
index 898399fb4..db3a45de8 100644
--- a/pages/ajax.render.php
+++ b/pages/ajax.render.php
@@ -1538,7 +1538,10 @@ EOF
 			case 'relation_pdf':
 			case 'relation_attachment':
 				require_once(APPROOT.'core/simplegraph.class.inc.php');
-				//require_once(APPROOT.'core/relationgraph.class.inc.php');
+				require_once(APPROOT.'/sources/Core/RelationGraph/RelationEdge.php');
+				require_once(APPROOT.'/sources/Core/RelationGraph/RelationGraph.php');
+				require_once(APPROOT.'/sources/Core/RelationGraph/RelationObjectNode.php');
+				require_once(APPROOT.'/sources/Core/RelationGraph/RelationRedundancyNode.php');
 				require_once(APPROOT.'core/displayablegraph.class.inc.php');
 				$sRelation = utils::ReadParam('relation', 'impacts');
 				$sDirection = utils::ReadParam('direction', 'down');
@@ -1696,7 +1699,11 @@ EOF
 
 			case 'relation_json':
 				require_once(APPROOT.'core/simplegraph.class.inc.php');
-				//require_once(APPROOT.'core/relationgraph.class.inc.php');
+
+				require_once(APPROOT.'/sources/Core/RelationGraph/RelationEdge.php');
+				require_once(APPROOT.'/sources/Core/RelationGraph/RelationGraph.php');
+				require_once(APPROOT.'/sources/Core/RelationGraph/RelationObjectNode.php');
+				require_once(APPROOT.'/sources/Core/RelationGraph/RelationRedundancyNode.php');
 				require_once(APPROOT.'core/displayablegraph.class.inc.php');
 				$sRelation = utils::ReadParam('relation', 'impacts');
 				$sDirection = utils::ReadParam('direction', 'down');
@@ -1801,7 +1808,10 @@ EOF
 
 			case 'ticket_impact':
 				require_once(APPROOT.'core/simplegraph.class.inc.php');
-				//require_once(APPROOT.'core/relationgraph.class.inc.php');
+				require_once(APPROOT.'/sources/Core/RelationGraph/RelationEdge.php');
+				require_once(APPROOT.'/sources/Core/RelationGraph/RelationGraph.php');
+				require_once(APPROOT.'/sources/Core/RelationGraph/RelationObjectNode.php');
+				require_once(APPROOT.'/sources/Core/RelationGraph/RelationRedundancyNode.php');
 				require_once(APPROOT.'core/displayablegraph.class.inc.php');
 
 				$sRelation = utils::ReadParam('relation', 'impacts');
diff --git a/sources/Core/AttributeDefinition/AttributeDefinition.php b/sources/Core/AttributeDefinition/AttributeDefinition.php
index 6d4ec03e2..c43ccbfe9 100644
--- a/sources/Core/AttributeDefinition/AttributeDefinition.php
+++ b/sources/Core/AttributeDefinition/AttributeDefinition.php
@@ -1,5 +1,89 @@
 <?php
 
+/**
+ * add some description here...
+ *
+ * @package     iTopORM
+ */
+define('EXTKEY_RELATIVE', 1);
+
+/**
+ * add some description here...
+ *
+ * @package     iTopORM
+ */
+define('EXTKEY_ABSOLUTE', 2);
+
+/**
+ * Propagation of the deletion through an external key - ask the user to delete the referencing object
+ *
+ * @package     iTopORM
+ */
+define('DEL_MANUAL', 1);
+
+/**
+ * Propagation of the deletion through an external key - remove linked objects if ext key has is_null_allowed=false
+ *
+ * @package     iTopORM
+ */
+define('DEL_AUTO', 2);
+/**
+ * Fully silent delete... not yet implemented
+ */
+define('DEL_SILENT', 2);
+/**
+ * For HierarchicalKeys only: move all the children up one level automatically
+ */
+define('DEL_MOVEUP', 3);
+
+/**
+ * Do nothing at least automatically
+ */
+define('DEL_NONE', 4);
+
+
+/**
+ * For Link sets: tracking_level
+ *
+ * @package     iTopORM
+ */
+define('ATTRIBUTE_TRACKING_NONE', 0); // Do not track changes of the attribute
+define('ATTRIBUTE_TRACKING_ALL', 3); // Do track all changes of the attribute
+define('LINKSET_TRACKING_NONE', 0); // Do not track changes in the link set
+define('LINKSET_TRACKING_LIST', 1); // Do track added/removed items
+define('LINKSET_TRACKING_DETAILS', 2); // Do track modified items
+define('LINKSET_TRACKING_ALL', 3); // Do track added/removed/modified items
+
+define('LINKSET_EDITMODE_NONE', 0); // The linkset cannot be edited at all from inside this object
+define('LINKSET_EDITMODE_ADDONLY', 1); // The only possible action is to open a new window to create a new object
+define('LINKSET_EDITMODE_ACTIONS', 2); // Show the usual 'Actions' popup menu
+define('LINKSET_EDITMODE_INPLACE', 3); // The "linked" objects can be created/modified/deleted in place
+define('LINKSET_EDITMODE_ADDREMOVE', 4); // The "linked" objects can be added/removed in place
+
+define('LINKSET_EDITWHEN_NEVER', 0); // The linkset cannot be edited at all from inside this object
+define('LINKSET_EDITWHEN_ON_HOST_EDITION', 1); // The only possible action is to open a new window to create a new object
+define('LINKSET_EDITWHEN_ON_HOST_DISPLAY', 2); // Show the usual 'Actions' popup menu
+define('LINKSET_EDITWHEN_ALWAYS', 3); // Show the usual 'Actions' popup menu
+
+
+define('LINKSET_DISPLAY_STYLE_PROPERTY', 'property');
+define('LINKSET_DISPLAY_STYLE_TAB', 'tab');
+
+
+/**
+ * Wiki formatting - experimental
+ *
+ * [[<objClass>:<objName|objId>|<label>]]
+ * <label> is optional
+ *
+ * Examples:
+ * - [[Server:db1.tnut.com]]
+ * - [[Server:123]]
+ * - [[Server:db1.tnut.com|Production server]]
+ * - [[Server:123|Production server]]
+ */
+define('WIKI_OBJECT_REGEXP', '/\[\[(.+):(.+)(\|(.+))?\]\]/U');
+
 /**
  * Attribute definition API, implemented in and many flavours (Int, String, Enum, etc.)
  *
diff --git a/sources/Core/BulkChange/bulkchange/BulkChange.php b/sources/Core/BulkChange/BulkChange.php
similarity index 100%
rename from sources/Core/BulkChange/bulkchange/BulkChange.php
rename to sources/Core/BulkChange/BulkChange.php
diff --git a/sources/Core/BulkChange/bulkchange/CellChangeSpec.php b/sources/Core/BulkChange/CellChangeSpec.php
similarity index 100%
rename from sources/Core/BulkChange/bulkchange/CellChangeSpec.php
rename to sources/Core/BulkChange/CellChangeSpec.php
diff --git a/sources/Core/BulkChange/bulkchange/CellStatus_Ambiguous.php b/sources/Core/BulkChange/CellStatus_Ambiguous.php
similarity index 100%
rename from sources/Core/BulkChange/bulkchange/CellStatus_Ambiguous.php
rename to sources/Core/BulkChange/CellStatus_Ambiguous.php
diff --git a/sources/Core/BulkChange/bulkchange/CellStatus_Issue.php b/sources/Core/BulkChange/CellStatus_Issue.php
similarity index 100%
rename from sources/Core/BulkChange/bulkchange/CellStatus_Issue.php
rename to sources/Core/BulkChange/CellStatus_Issue.php
diff --git a/sources/Core/BulkChange/bulkchange/CellStatus_Modify.php b/sources/Core/BulkChange/CellStatus_Modify.php
similarity index 100%
rename from sources/Core/BulkChange/bulkchange/CellStatus_Modify.php
rename to sources/Core/BulkChange/CellStatus_Modify.php
diff --git a/sources/Core/BulkChange/bulkchange/CellStatus_NullIssue.php b/sources/Core/BulkChange/CellStatus_NullIssue.php
similarity index 100%
rename from sources/Core/BulkChange/bulkchange/CellStatus_NullIssue.php
rename to sources/Core/BulkChange/CellStatus_NullIssue.php
diff --git a/sources/Core/BulkChange/bulkchange/CellStatus_SearchIssue.php b/sources/Core/BulkChange/CellStatus_SearchIssue.php
similarity index 100%
rename from sources/Core/BulkChange/bulkchange/CellStatus_SearchIssue.php
rename to sources/Core/BulkChange/CellStatus_SearchIssue.php
diff --git a/sources/Core/BulkChange/bulkchange/CellStatus_Void.php b/sources/Core/BulkChange/CellStatus_Void.php
similarity index 100%
rename from sources/Core/BulkChange/bulkchange/CellStatus_Void.php
rename to sources/Core/BulkChange/CellStatus_Void.php
diff --git a/sources/Core/BulkChange/bulkchange/ReportValue.php b/sources/Core/BulkChange/ReportValue.php
similarity index 100%
rename from sources/Core/BulkChange/bulkchange/ReportValue.php
rename to sources/Core/BulkChange/ReportValue.php
diff --git a/sources/Core/BulkChange/bulkchange/RowStatus.php b/sources/Core/BulkChange/RowStatus.php
similarity index 100%
rename from sources/Core/BulkChange/bulkchange/RowStatus.php
rename to sources/Core/BulkChange/RowStatus.php
diff --git a/sources/Core/BulkChange/bulkchange/RowStatus_Disappeared.php b/sources/Core/BulkChange/RowStatus_Disappeared.php
similarity index 100%
rename from sources/Core/BulkChange/bulkchange/RowStatus_Disappeared.php
rename to sources/Core/BulkChange/RowStatus_Disappeared.php
diff --git a/sources/Core/BulkChange/bulkchange/RowStatus_Error.php b/sources/Core/BulkChange/RowStatus_Error.php
similarity index 100%
rename from sources/Core/BulkChange/bulkchange/RowStatus_Error.php
rename to sources/Core/BulkChange/RowStatus_Error.php
diff --git a/sources/Core/BulkChange/bulkchange/RowStatus_Issue.php b/sources/Core/BulkChange/RowStatus_Issue.php
similarity index 100%
rename from sources/Core/BulkChange/bulkchange/RowStatus_Issue.php
rename to sources/Core/BulkChange/RowStatus_Issue.php
diff --git a/sources/Core/BulkChange/bulkchange/RowStatus_Modify.php b/sources/Core/BulkChange/RowStatus_Modify.php
similarity index 100%
rename from sources/Core/BulkChange/bulkchange/RowStatus_Modify.php
rename to sources/Core/BulkChange/RowStatus_Modify.php
diff --git a/sources/Core/BulkChange/bulkchange/RowStatus_NewObj.php b/sources/Core/BulkChange/RowStatus_NewObj.php
similarity index 100%
rename from sources/Core/BulkChange/bulkchange/RowStatus_NewObj.php
rename to sources/Core/BulkChange/RowStatus_NewObj.php
diff --git a/sources/Core/BulkChange/bulkchange/RowStatus_NoChange.php b/sources/Core/BulkChange/RowStatus_NoChange.php
similarity index 100%
rename from sources/Core/BulkChange/bulkchange/RowStatus_NoChange.php
rename to sources/Core/BulkChange/RowStatus_NoChange.php
diff --git a/sources/Core/TriggerAndAction/Enum/SubscriptionPolicy.php b/sources/Core/Trigger/Enum/SubscriptionPolicy.php
similarity index 100%
rename from sources/Core/TriggerAndAction/Enum/SubscriptionPolicy.php
rename to sources/Core/Trigger/Enum/SubscriptionPolicy.php
diff --git a/webservices/export-v2.php b/webservices/export-v2.php
index a902bf044..6b68da052 100644
--- a/webservices/export-v2.php
+++ b/webservices/export-v2.php
@@ -26,7 +26,10 @@ use Combodo\iTop\Application\WebPage\WebPage;
 require_once(__DIR__.'/../approot.inc.php');
 require_once(APPROOT.'/application/application.inc.php');
 require_once(APPROOT.'/application/excelexporter.class.inc.php');
-require_once(APPROOT.'/core/bulkexport.class.inc.php');
+require_once(APPROOT.'/sources/Application/BulkExport/BulkExport.php');
+require_once(APPROOT.'/sources/Application/BulkExport/BulkExportException.php');
+require_once(APPROOT.'/sources/Application/BulkExport/BulkExportMissingParameterException.php');
+require_once(APPROOT.'/sources/Application/BulkExport/BulkExportResultGC.php');
 
 require_once(APPROOT.'/application/startup.inc.php');