diff --git a/core/config.class.inc.php b/core/config.class.inc.php
index 8a504a6d8..5b72c4794 100644
--- a/core/config.class.inc.php
+++ b/core/config.class.inc.php
@@ -55,6 +55,7 @@ require_once(APPROOT.'/sources/Application/SimpleCrypt/SimpleCryptMcryptEngine.p
 require_once(APPROOT.'/sources/Application/SimpleCrypt/SimpleCryptOpenSSLEngine.php');
 require_once(APPROOT.'/sources/Application/SimpleCrypt/SimpleCryptOpenSSLMcryptCompatibilityEngine.php');
 require_once(APPROOT.'/sources/Application/SimpleCrypt/SimpleCryptSimpleEngine.php');
+require_once(APPROOT.'/sources/Application/SimpleCrypt/SimpleCryptSodiumEngine.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/sources/Application/BulkExport/BulkExport.php b/sources/Application/BulkExport/BulkExport.php
index c7c80ebe0..75cee6655 100644
--- a/sources/Application/BulkExport/BulkExport.php
+++ b/sources/Application/BulkExport/BulkExport.php
@@ -1,5 +1,8 @@
 <?php
 
+use Combodo\iTop\Application\WebPage\Page;
+use Combodo\iTop\Application\WebPage\WebPage;
+
 /**
  * Class BulkExport
  *
@@ -193,7 +196,7 @@ abstract class BulkExport
 	}
 
 
-	public function SetHttpHeaders(\Combodo\iTop\Application\WebPage\WebPage $oPage)
+	public function SetHttpHeaders(WebPage $oPage)
 	{
 	}
 
@@ -254,7 +257,7 @@ abstract class BulkExport
 	/**
 	 * @deprecated 3.0.0 use GetFormPart instead
 	 */
-	public function DisplayFormPart(\Combodo\iTop\Application\WebPage\WebPage $oP, $sPartId)
+	public function DisplayFormPart(WebPage $oP, $sPartId)
 	{
 		DeprecatedCallsLog::NotifyDeprecatedPhpMethod('use GetFormPart instead');
 		$oP->AddSubBlock($this->GetFormPart($oP, $sPartId));
@@ -267,11 +270,11 @@ abstract class BulkExport
 	 *
 	 * @return UIContentBlock
 	 */
-	public function GetFormPart(\Combodo\iTop\Application\WebPage\WebPage $oP, $sPartId)
+	public function GetFormPart(WebPage $oP, $sPartId)
 	{
 	}
 
-	public function DisplayUsage(\Combodo\iTop\Application\WebPage\Page $oP)
+	public function DisplayUsage(Page $oP)
 	{
 
 	}
diff --git a/core/excelbulkexport.class.inc.php b/sources/Application/BulkExport/excelbulkexport.class.inc.php
similarity index 100%
rename from core/excelbulkexport.class.inc.php
rename to sources/Application/BulkExport/excelbulkexport.class.inc.php
diff --git a/core/htmlbulkexport.class.inc.php b/sources/Application/BulkExport/htmlbulkexport.class.inc.php
similarity index 100%
rename from core/htmlbulkexport.class.inc.php
rename to sources/Application/BulkExport/htmlbulkexport.class.inc.php
diff --git a/core/pdfbulkexport.class.inc.php b/sources/Application/BulkExport/pdfbulkexport.class.inc.php
similarity index 100%
rename from core/pdfbulkexport.class.inc.php
rename to sources/Application/BulkExport/pdfbulkexport.class.inc.php
diff --git a/core/spreadsheetbulkexport.class.inc.php b/sources/Application/BulkExport/spreadsheetbulkexport.class.inc.php
similarity index 100%
rename from core/spreadsheetbulkexport.class.inc.php
rename to sources/Application/BulkExport/spreadsheetbulkexport.class.inc.php
diff --git a/core/tabularbulkexport.class.inc.php b/sources/Application/BulkExport/tabularbulkexport.class.inc.php
similarity index 100%
rename from core/tabularbulkexport.class.inc.php
rename to sources/Application/BulkExport/tabularbulkexport.class.inc.php
diff --git a/core/xmlbulkexport.class.inc.php b/sources/Application/BulkExport/xmlbulkexport.class.inc.php
similarity index 100%
rename from core/xmlbulkexport.class.inc.php
rename to sources/Application/BulkExport/xmlbulkexport.class.inc.php
diff --git a/tests/php-unit-tests/unitary-tests/core/ValueSetObjectsTest.php b/tests/php-unit-tests/unitary-tests/core/ValueSetObjectsTest.php
index 74620b10d..317e6b606 100644
--- a/tests/php-unit-tests/unitary-tests/core/ValueSetObjectsTest.php
+++ b/tests/php-unit-tests/unitary-tests/core/ValueSetObjectsTest.php
@@ -17,7 +17,16 @@ class ValueSetObjectsTest extends ItopTestCase
 	protected function setUp(): void
 	{
 		parent::setUp();
-		$this->RequireOnceItopFile('core/valuesetdef.class.inc.php');
+
+		$this->RequireOnceItopFile('MyHelpers.class.inc.php');
+
+		$this->RequireOnceItopFile(APPROOT.'/sources/Core/ValueSetDefinition/ValueSetDefinition.php');
+		$this->RequireOnceItopFile(APPROOT.'/sources/Core/ValueSetDefinition/ValueSetObjects.php');
+		$this->RequireOnceItopFile(APPROOT.'/sources/Core/ValueSetDefinition/ValueSetEnum.php');
+		$this->RequireOnceItopFile(APPROOT.'/sources/Core/ValueSetDefinition/ValueSetEnumPadded.php');
+		$this->RequireOnceItopFile(APPROOT.'/sources/Core/ValueSetDefinition/ValueSetRange.php');
+		$this->RequireOnceItopFile(APPROOT.'/sources/Core/ValueSetDefinition/ValueSetEnumClasses.php');
+
 		$this->RequireOnceItopFile('application/startup.inc.php');
 		$this->RequireOnceUnitTestFile('./MockValueSetObjects.php');
 	}