diff --git a/lib/autoload.php b/lib/autoload.php
index 9ee03077e..db10dc867 100644
--- a/lib/autoload.php
+++ b/lib/autoload.php
@@ -14,7 +14,10 @@ if (PHP_VERSION_ID < 50600) {
             echo $err;
         }
     }
-    throw new RuntimeException($err);
+    trigger_error(
+        $err,
+        E_USER_ERROR
+    );
 }
 
 require_once __DIR__ . '/composer/autoload_real.php';
diff --git a/lib/composer/autoload_classmap.php b/lib/composer/autoload_classmap.php
index eccb877e4..b35dca37c 100644
--- a/lib/composer/autoload_classmap.php
+++ b/lib/composer/autoload_classmap.php
@@ -469,6 +469,31 @@ return array(
     'Combodo\\iTop\\Form\\Validator\\NotEmptyExtKeyValidator' => $baseDir . '/sources/Form/Validator/NotEmptyExtKeyValidator.php',
     'Combodo\\iTop\\Form\\Validator\\SelectObjectValidator' => $baseDir . '/sources/Form/Validator/SelectObjectValidator.php',
     'Combodo\\iTop\\Kernel' => $baseDir . '/sources/Kernel.php',
+    'Combodo\\iTop\\PhpParser\\Evaluation\\ArrayDimFetchEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/ArrayDimFetchEvaluator.php',
+    'Combodo\\iTop\\PhpParser\\Evaluation\\ArrayEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/ArrayEvaluator.php',
+    'Combodo\\iTop\\PhpParser\\Evaluation\\BinaryOpEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/BinaryOpEvaluator.php',
+    'Combodo\\iTop\\PhpParser\\Evaluation\\BitwiseAndEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/BitwiseAndEvaluator.php',
+    'Combodo\\iTop\\PhpParser\\Evaluation\\BitwiseOrEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/BitwiseOrEvaluator.php',
+    'Combodo\\iTop\\PhpParser\\Evaluation\\BooleanAndEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/BooleanAndEvaluator.php',
+    'Combodo\\iTop\\PhpParser\\Evaluation\\BooleanNotEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/BooleanNotEvaluator.php',
+    'Combodo\\iTop\\PhpParser\\Evaluation\\BooleanOrEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/BooleanOrEvaluator.php',
+    'Combodo\\iTop\\PhpParser\\Evaluation\\ClassConstFetchEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/ClassConstFetchEvaluator.php',
+    'Combodo\\iTop\\PhpParser\\Evaluation\\ConcatEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/ConcatEvaluator.php',
+    'Combodo\\iTop\\PhpParser\\Evaluation\\ConstFetchEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/ConstFetchEvaluator.php',
+    'Combodo\\iTop\\PhpParser\\Evaluation\\EqualEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/EqualEvaluator.php',
+    'Combodo\\iTop\\PhpParser\\Evaluation\\FuncCallEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/FuncCallEvaluator.php',
+    'Combodo\\iTop\\PhpParser\\Evaluation\\GreaterEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/GreaterEvaluator.php',
+    'Combodo\\iTop\\PhpParser\\Evaluation\\GreaterOrEqualEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/GreaterOrEqualEvaluator.php',
+    'Combodo\\iTop\\PhpParser\\Evaluation\\MulEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/MulEvaluator.php',
+    'Combodo\\iTop\\PhpParser\\Evaluation\\NotEqualEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/NotEqualEvaluator.php',
+    'Combodo\\iTop\\PhpParser\\Evaluation\\PhpExpressionEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/PhpExpressionEvaluator.php',
+    'Combodo\\iTop\\PhpParser\\Evaluation\\SmallerEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/SmallerEvaluator.php',
+    'Combodo\\iTop\\PhpParser\\Evaluation\\SmallerOrEqualEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/SmallerOrEqualEvaluator.php',
+    'Combodo\\iTop\\PhpParser\\Evaluation\\StaticCallEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/StaticCallEvaluator.php',
+    'Combodo\\iTop\\PhpParser\\Evaluation\\StaticPropertyFetchEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/StaticPropertyFetchEvaluator.php',
+    'Combodo\\iTop\\PhpParser\\Evaluation\\UnaryMinusEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/UnaryMinusEvaluator.php',
+    'Combodo\\iTop\\PhpParser\\Evaluation\\VariableEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/VariableEvaluator.php',
+    'Combodo\\iTop\\PhpParser\\Evaluation\\iExprEvaluator' => $baseDir . '/sources/PhpParser/Evaluation/iExprEvaluator.php',
     'Combodo\\iTop\\Renderer\\BlockRenderer' => $baseDir . '/sources/Renderer/BlockRenderer.php',
     'Combodo\\iTop\\Renderer\\Bootstrap\\BsFieldRendererMappings' => $baseDir . '/sources/Renderer/Bootstrap/BsFieldRendererMappings.php',
     'Combodo\\iTop\\Renderer\\Bootstrap\\BsFormRenderer' => $baseDir . '/sources/Renderer/Bootstrap/BsFormRenderer.php',
diff --git a/lib/composer/autoload_psr4.php b/lib/composer/autoload_psr4.php
index 18f7002d4..d57e59860 100644
--- a/lib/composer/autoload_psr4.php
+++ b/lib/composer/autoload_psr4.php
@@ -56,7 +56,7 @@ return array(
     'Psr\\Cache\\' => array($vendorDir . '/psr/cache/src'),
     'PhpParser\\' => array($vendorDir . '/nikic/php-parser/lib/PhpParser'),
     'Pelago\\Emogrifier\\' => array($vendorDir . '/pelago/emogrifier/src'),
-    'League\\OAuth2\\Client\\' => array($vendorDir . '/league/oauth2-google/src', $vendorDir . '/league/oauth2-client/src'),
+    'League\\OAuth2\\Client\\' => array($vendorDir . '/league/oauth2-client/src', $vendorDir . '/league/oauth2-google/src'),
     'Laminas\\Validator\\' => array($vendorDir . '/laminas/laminas-validator/src'),
     'Laminas\\Stdlib\\' => array($vendorDir . '/laminas/laminas-stdlib/src'),
     'Laminas\\ServiceManager\\' => array($vendorDir . '/laminas/laminas-servicemanager/src'),
diff --git a/lib/composer/autoload_static.php b/lib/composer/autoload_static.php
index 2d9aa046e..1c3aca7fd 100644
--- a/lib/composer/autoload_static.php
+++ b/lib/composer/autoload_static.php
@@ -317,8 +317,8 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         ),
         'League\\OAuth2\\Client\\' => 
         array (
-            0 => __DIR__ . '/..' . '/league/oauth2-google/src',
-            1 => __DIR__ . '/..' . '/league/oauth2-client/src',
+            0 => __DIR__ . '/..' . '/league/oauth2-client/src',
+            1 => __DIR__ . '/..' . '/league/oauth2-google/src',
         ),
         'Laminas\\Validator\\' => 
         array (
@@ -847,6 +847,31 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'Combodo\\iTop\\Form\\Validator\\NotEmptyExtKeyValidator' => __DIR__ . '/../..' . '/sources/Form/Validator/NotEmptyExtKeyValidator.php',
         'Combodo\\iTop\\Form\\Validator\\SelectObjectValidator' => __DIR__ . '/../..' . '/sources/Form/Validator/SelectObjectValidator.php',
         'Combodo\\iTop\\Kernel' => __DIR__ . '/../..' . '/sources/Kernel.php',
+        'Combodo\\iTop\\PhpParser\\Evaluation\\ArrayDimFetchEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/ArrayDimFetchEvaluator.php',
+        'Combodo\\iTop\\PhpParser\\Evaluation\\ArrayEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/ArrayEvaluator.php',
+        'Combodo\\iTop\\PhpParser\\Evaluation\\BinaryOpEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/BinaryOpEvaluator.php',
+        'Combodo\\iTop\\PhpParser\\Evaluation\\BitwiseAndEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/BitwiseAndEvaluator.php',
+        'Combodo\\iTop\\PhpParser\\Evaluation\\BitwiseOrEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/BitwiseOrEvaluator.php',
+        'Combodo\\iTop\\PhpParser\\Evaluation\\BooleanAndEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/BooleanAndEvaluator.php',
+        'Combodo\\iTop\\PhpParser\\Evaluation\\BooleanNotEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/BooleanNotEvaluator.php',
+        'Combodo\\iTop\\PhpParser\\Evaluation\\BooleanOrEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/BooleanOrEvaluator.php',
+        'Combodo\\iTop\\PhpParser\\Evaluation\\ClassConstFetchEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/ClassConstFetchEvaluator.php',
+        'Combodo\\iTop\\PhpParser\\Evaluation\\ConcatEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/ConcatEvaluator.php',
+        'Combodo\\iTop\\PhpParser\\Evaluation\\ConstFetchEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/ConstFetchEvaluator.php',
+        'Combodo\\iTop\\PhpParser\\Evaluation\\EqualEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/EqualEvaluator.php',
+        'Combodo\\iTop\\PhpParser\\Evaluation\\FuncCallEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/FuncCallEvaluator.php',
+        'Combodo\\iTop\\PhpParser\\Evaluation\\GreaterEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/GreaterEvaluator.php',
+        'Combodo\\iTop\\PhpParser\\Evaluation\\GreaterOrEqualEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/GreaterOrEqualEvaluator.php',
+        'Combodo\\iTop\\PhpParser\\Evaluation\\MulEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/MulEvaluator.php',
+        'Combodo\\iTop\\PhpParser\\Evaluation\\NotEqualEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/NotEqualEvaluator.php',
+        'Combodo\\iTop\\PhpParser\\Evaluation\\PhpExpressionEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/PhpExpressionEvaluator.php',
+        'Combodo\\iTop\\PhpParser\\Evaluation\\SmallerEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/SmallerEvaluator.php',
+        'Combodo\\iTop\\PhpParser\\Evaluation\\SmallerOrEqualEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/SmallerOrEqualEvaluator.php',
+        'Combodo\\iTop\\PhpParser\\Evaluation\\StaticCallEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/StaticCallEvaluator.php',
+        'Combodo\\iTop\\PhpParser\\Evaluation\\StaticPropertyFetchEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/StaticPropertyFetchEvaluator.php',
+        'Combodo\\iTop\\PhpParser\\Evaluation\\UnaryMinusEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/UnaryMinusEvaluator.php',
+        'Combodo\\iTop\\PhpParser\\Evaluation\\VariableEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/VariableEvaluator.php',
+        'Combodo\\iTop\\PhpParser\\Evaluation\\iExprEvaluator' => __DIR__ . '/../..' . '/sources/PhpParser/Evaluation/iExprEvaluator.php',
         'Combodo\\iTop\\Renderer\\BlockRenderer' => __DIR__ . '/../..' . '/sources/Renderer/BlockRenderer.php',
         'Combodo\\iTop\\Renderer\\Bootstrap\\BsFieldRendererMappings' => __DIR__ . '/../..' . '/sources/Renderer/Bootstrap/BsFieldRendererMappings.php',
         'Combodo\\iTop\\Renderer\\Bootstrap\\BsFormRenderer' => __DIR__ . '/../..' . '/sources/Renderer/Bootstrap/BsFormRenderer.php',
diff --git a/lib/composer/platform_check.php b/lib/composer/platform_check.php
index 72145773d..dee74e173 100644
--- a/lib/composer/platform_check.php
+++ b/lib/composer/platform_check.php
@@ -36,7 +36,8 @@ if ($issues) {
             echo 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . str_replace('You are running '.PHP_VERSION.'.', '', implode(PHP_EOL, $issues)) . PHP_EOL.PHP_EOL;
         }
     }
-    throw new \RuntimeException(
-        'Composer detected issues in your platform: ' . implode(' ', $issues)
+    trigger_error(
+        'Composer detected issues in your platform: ' . implode(' ', $issues),
+        E_USER_ERROR
     );
 }
diff --git a/setup/modulediscovery/ModuleFileParser.php b/setup/modulediscovery/ModuleFileParser.php
index 08f36496c..5064c3481 100644
--- a/setup/modulediscovery/ModuleFileParser.php
+++ b/setup/modulediscovery/ModuleFileParser.php
@@ -1,11 +1,10 @@
 <?php
 
-use evaluation\expression\PhpExpressionEvaluator;
-use PhpParser\Node\Expr;
+use Combodo\iTop\PhpParser\Evaluation\PhpExpressionEvaluator;
 use PhpParser\Node\Expr\Assign;
 use PhpParser\ParserFactory;
+require_once APPROOT . 'sources/PhpParser/Evaluation/PhpExpressionEvaluator.php';
 
-require_once __DIR__ . "/evaluation/expression/PhpExpressionEvaluator.php";
 class ModuleFileParser {
 	private static ModuleFileParser $oInstance;
 
diff --git a/setup/modulediscovery/ModuleFileReader.php b/setup/modulediscovery/ModuleFileReader.php
index e2229f680..63ff26a10 100644
--- a/setup/modulediscovery/ModuleFileReader.php
+++ b/setup/modulediscovery/ModuleFileReader.php
@@ -1,8 +1,5 @@
 <?php
 
-use PhpParser\ParserFactory;
-use PhpParser\Node\Expr\Assign;
-
 require_once __DIR__ . '/ModuleFileParser.php';
 require_once __DIR__ . '/ModuleFileReaderException.php';
 
diff --git a/setup/modulediscovery/evaluation/expression/ArrayDimFetchEvaluator.php b/sources/PhpParser/Evaluation/ArrayDimFetchEvaluator.php
similarity index 92%
rename from setup/modulediscovery/evaluation/expression/ArrayDimFetchEvaluator.php
rename to sources/PhpParser/Evaluation/ArrayDimFetchEvaluator.php
index b6787696f..59b8e7d75 100644
--- a/setup/modulediscovery/evaluation/expression/ArrayDimFetchEvaluator.php
+++ b/sources/PhpParser/Evaluation/ArrayDimFetchEvaluator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace evaluation\expression;
+namespace Combodo\iTop\PhpParser\Evaluation;;
 
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\ArrayDimFetch;
diff --git a/setup/modulediscovery/evaluation/expression/ArrayEvaluator.php b/sources/PhpParser/Evaluation/ArrayEvaluator.php
similarity index 96%
rename from setup/modulediscovery/evaluation/expression/ArrayEvaluator.php
rename to sources/PhpParser/Evaluation/ArrayEvaluator.php
index a65ca11a4..694653dfb 100644
--- a/setup/modulediscovery/evaluation/expression/ArrayEvaluator.php
+++ b/sources/PhpParser/Evaluation/ArrayEvaluator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace evaluation\expression;
+namespace Combodo\iTop\PhpParser\Evaluation;;
 
 use ModuleFileReaderException;
 use PhpParser\Node\Expr;
diff --git a/setup/modulediscovery/evaluation/expression/BinaryOpEvaluator.php b/sources/PhpParser/Evaluation/BinaryOpEvaluator.php
similarity index 91%
rename from setup/modulediscovery/evaluation/expression/BinaryOpEvaluator.php
rename to sources/PhpParser/Evaluation/BinaryOpEvaluator.php
index cb7ce4b27..7c979ae4c 100644
--- a/setup/modulediscovery/evaluation/expression/BinaryOpEvaluator.php
+++ b/sources/PhpParser/Evaluation/BinaryOpEvaluator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace evaluation\expression;
+namespace Combodo\iTop\PhpParser\Evaluation;;
 
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\BinaryOp;
diff --git a/setup/modulediscovery/evaluation/expression/BitwiseAndEvaluator.php b/sources/PhpParser/Evaluation/BitwiseAndEvaluator.php
similarity index 86%
rename from setup/modulediscovery/evaluation/expression/BitwiseAndEvaluator.php
rename to sources/PhpParser/Evaluation/BitwiseAndEvaluator.php
index 68a7e4878..1063f3967 100644
--- a/setup/modulediscovery/evaluation/expression/BitwiseAndEvaluator.php
+++ b/sources/PhpParser/Evaluation/BitwiseAndEvaluator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace evaluation\expression;
+namespace Combodo\iTop\PhpParser\Evaluation;;
 
 use PhpParser\Node\Expr\BinaryOp\BitwiseAnd;
 
diff --git a/setup/modulediscovery/evaluation/expression/BitwiseOrEvaluator.php b/sources/PhpParser/Evaluation/BitwiseOrEvaluator.php
similarity index 86%
rename from setup/modulediscovery/evaluation/expression/BitwiseOrEvaluator.php
rename to sources/PhpParser/Evaluation/BitwiseOrEvaluator.php
index e944eb2e6..9c8a6be3a 100644
--- a/setup/modulediscovery/evaluation/expression/BitwiseOrEvaluator.php
+++ b/sources/PhpParser/Evaluation/BitwiseOrEvaluator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace evaluation\expression;
+namespace Combodo\iTop\PhpParser\Evaluation;;
 
 use PhpParser\Node\Expr\BinaryOp\BitwiseOr;
 
diff --git a/setup/modulediscovery/evaluation/expression/BooleanAndEvaluator.php b/sources/PhpParser/Evaluation/BooleanAndEvaluator.php
similarity index 86%
rename from setup/modulediscovery/evaluation/expression/BooleanAndEvaluator.php
rename to sources/PhpParser/Evaluation/BooleanAndEvaluator.php
index 0fd428c40..e98f3130f 100644
--- a/setup/modulediscovery/evaluation/expression/BooleanAndEvaluator.php
+++ b/sources/PhpParser/Evaluation/BooleanAndEvaluator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace evaluation\expression;
+namespace Combodo\iTop\PhpParser\Evaluation;;
 
 use PhpParser\Node\Expr\BinaryOp\BooleanAnd;
 
diff --git a/setup/modulediscovery/evaluation/expression/BooleanNotEvaluator.php b/sources/PhpParser/Evaluation/BooleanNotEvaluator.php
similarity index 89%
rename from setup/modulediscovery/evaluation/expression/BooleanNotEvaluator.php
rename to sources/PhpParser/Evaluation/BooleanNotEvaluator.php
index 744ec57a9..2fe100eab 100644
--- a/setup/modulediscovery/evaluation/expression/BooleanNotEvaluator.php
+++ b/sources/PhpParser/Evaluation/BooleanNotEvaluator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace evaluation\expression;
+namespace Combodo\iTop\PhpParser\Evaluation;;
 
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\BooleanNot;
diff --git a/setup/modulediscovery/evaluation/expression/BooleanOrEvaluator.php b/sources/PhpParser/Evaluation/BooleanOrEvaluator.php
similarity index 86%
rename from setup/modulediscovery/evaluation/expression/BooleanOrEvaluator.php
rename to sources/PhpParser/Evaluation/BooleanOrEvaluator.php
index 38abe1b8e..eae58fc06 100644
--- a/setup/modulediscovery/evaluation/expression/BooleanOrEvaluator.php
+++ b/sources/PhpParser/Evaluation/BooleanOrEvaluator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace evaluation\expression;
+namespace Combodo\iTop\PhpParser\Evaluation;;
 
 use PhpParser\Node\Expr\BinaryOp\BooleanOr;
 
diff --git a/setup/modulediscovery/evaluation/expression/ClassConstFetchEvaluator.php b/sources/PhpParser/Evaluation/ClassConstFetchEvaluator.php
similarity index 94%
rename from setup/modulediscovery/evaluation/expression/ClassConstFetchEvaluator.php
rename to sources/PhpParser/Evaluation/ClassConstFetchEvaluator.php
index fe53f80ef..2f4b0bc9c 100644
--- a/setup/modulediscovery/evaluation/expression/ClassConstFetchEvaluator.php
+++ b/sources/PhpParser/Evaluation/ClassConstFetchEvaluator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace evaluation\expression;
+namespace Combodo\iTop\PhpParser\Evaluation;;
 
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\ClassConstFetch;
diff --git a/setup/modulediscovery/evaluation/expression/ConcatEvaluator.php b/sources/PhpParser/Evaluation/ConcatEvaluator.php
similarity index 90%
rename from setup/modulediscovery/evaluation/expression/ConcatEvaluator.php
rename to sources/PhpParser/Evaluation/ConcatEvaluator.php
index 9008f4cfd..4605eb0bd 100644
--- a/setup/modulediscovery/evaluation/expression/ConcatEvaluator.php
+++ b/sources/PhpParser/Evaluation/ConcatEvaluator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace evaluation\expression;
+namespace Combodo\iTop\PhpParser\Evaluation;;
 
 use PhpParser\Node\Expr\BinaryOp\Concat;
 
diff --git a/setup/modulediscovery/evaluation/expression/ConstFetchEvaluator.php b/sources/PhpParser/Evaluation/ConstFetchEvaluator.php
similarity index 89%
rename from setup/modulediscovery/evaluation/expression/ConstFetchEvaluator.php
rename to sources/PhpParser/Evaluation/ConstFetchEvaluator.php
index 402778c06..a0c24768d 100644
--- a/setup/modulediscovery/evaluation/expression/ConstFetchEvaluator.php
+++ b/sources/PhpParser/Evaluation/ConstFetchEvaluator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace evaluation\expression;
+namespace Combodo\iTop\PhpParser\Evaluation;;
 
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\ConstFetch;
diff --git a/setup/modulediscovery/evaluation/expression/EqualEvaluator.php b/sources/PhpParser/Evaluation/EqualEvaluator.php
similarity index 85%
rename from setup/modulediscovery/evaluation/expression/EqualEvaluator.php
rename to sources/PhpParser/Evaluation/EqualEvaluator.php
index 919adba2b..c12b71b42 100644
--- a/setup/modulediscovery/evaluation/expression/EqualEvaluator.php
+++ b/sources/PhpParser/Evaluation/EqualEvaluator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace evaluation\expression;
+namespace Combodo\iTop\PhpParser\Evaluation;;
 
 use PhpParser\Node\Expr\BinaryOp\Equal;
 
diff --git a/setup/modulediscovery/evaluation/expression/FuncCallEvaluator.php b/sources/PhpParser/Evaluation/FuncCallEvaluator.php
similarity index 94%
rename from setup/modulediscovery/evaluation/expression/FuncCallEvaluator.php
rename to sources/PhpParser/Evaluation/FuncCallEvaluator.php
index b50cee75a..020212939 100644
--- a/setup/modulediscovery/evaluation/expression/FuncCallEvaluator.php
+++ b/sources/PhpParser/Evaluation/FuncCallEvaluator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace evaluation\expression;
+namespace Combodo\iTop\PhpParser\Evaluation;;
 
 use ModuleFileReaderException;
 use PhpParser\Node\Expr;
diff --git a/setup/modulediscovery/evaluation/expression/GreaterEvaluator.php b/sources/PhpParser/Evaluation/GreaterEvaluator.php
similarity index 86%
rename from setup/modulediscovery/evaluation/expression/GreaterEvaluator.php
rename to sources/PhpParser/Evaluation/GreaterEvaluator.php
index ba9d1c10a..4f022cf47 100644
--- a/setup/modulediscovery/evaluation/expression/GreaterEvaluator.php
+++ b/sources/PhpParser/Evaluation/GreaterEvaluator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace evaluation\expression;
+namespace Combodo\iTop\PhpParser\Evaluation;;
 
 use PhpParser\Node\Expr\BinaryOp\Greater;
 
diff --git a/setup/modulediscovery/evaluation/expression/GreaterOrEqualEvaluator.php b/sources/PhpParser/Evaluation/GreaterOrEqualEvaluator.php
similarity index 87%
rename from setup/modulediscovery/evaluation/expression/GreaterOrEqualEvaluator.php
rename to sources/PhpParser/Evaluation/GreaterOrEqualEvaluator.php
index b4e7b9e9c..d9242a6c1 100644
--- a/setup/modulediscovery/evaluation/expression/GreaterOrEqualEvaluator.php
+++ b/sources/PhpParser/Evaluation/GreaterOrEqualEvaluator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace evaluation\expression;
+namespace Combodo\iTop\PhpParser\Evaluation;;
 
 use PhpParser\Node\Expr\BinaryOp\GreaterOrEqual;
 
diff --git a/setup/modulediscovery/evaluation/expression/MulEvaluator.php b/sources/PhpParser/Evaluation/MulEvaluator.php
similarity index 85%
rename from setup/modulediscovery/evaluation/expression/MulEvaluator.php
rename to sources/PhpParser/Evaluation/MulEvaluator.php
index 001f02001..c24e73e5f 100644
--- a/setup/modulediscovery/evaluation/expression/MulEvaluator.php
+++ b/sources/PhpParser/Evaluation/MulEvaluator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace evaluation\expression;
+namespace Combodo\iTop\PhpParser\Evaluation;;
 
 use PhpParser\Node\Expr\BinaryOp\Mul;
 
diff --git a/setup/modulediscovery/evaluation/expression/NotEqualEvaluator.php b/sources/PhpParser/Evaluation/NotEqualEvaluator.php
similarity index 86%
rename from setup/modulediscovery/evaluation/expression/NotEqualEvaluator.php
rename to sources/PhpParser/Evaluation/NotEqualEvaluator.php
index 469c77fad..73fdf7512 100644
--- a/setup/modulediscovery/evaluation/expression/NotEqualEvaluator.php
+++ b/sources/PhpParser/Evaluation/NotEqualEvaluator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace evaluation\expression;
+namespace Combodo\iTop\PhpParser\Evaluation;;
 
 use PhpParser\Node\Expr\BinaryOp\NotEqual;
 
diff --git a/setup/modulediscovery/evaluation/expression/PhpExpressionEvaluator.php b/sources/PhpParser/Evaluation/PhpExpressionEvaluator.php
similarity index 90%
rename from setup/modulediscovery/evaluation/expression/PhpExpressionEvaluator.php
rename to sources/PhpParser/Evaluation/PhpExpressionEvaluator.php
index 78db0667d..c4cffcdde 100644
--- a/setup/modulediscovery/evaluation/expression/PhpExpressionEvaluator.php
+++ b/sources/PhpParser/Evaluation/PhpExpressionEvaluator.php
@@ -1,8 +1,8 @@
 <?php
 
-#Combodo\\iTop\\
-namespace evaluation\expression;
+namespace Combodo\iTop\PhpParser\Evaluation;
 
+use ModuleFileParser;
 use PhpParser\Node\Expr;
 
 require_once __DIR__ . '/iExprEvaluator.php';
@@ -22,7 +22,7 @@ class PhpExpressionEvaluator {
 
 			foreach (glob(__DIR__ . "/**Evaluator.php") as $sFile){
 				require_once $sFile;
-				$sNamespace = 'evaluation\\expression\\';
+				$sNamespace = 'Combodo\\iTop\PhpParser\\Evaluation\\';
 				$sClass = $sNamespace. str_replace(".php", "", basename($sFile));
 				$oReflectionClass = new \ReflectionClass($sClass);
 				if ($oReflectionClass->isInstantiable()
@@ -69,7 +69,7 @@ class PhpExpressionEvaluator {
 $sExpr;
 PHP;
 		try{
-			$aNodes = \ModuleFileParser::GetInstance()->ParsePhpCode($sPhpContent);
+			$aNodes = ModuleFileParser::GetInstance()->ParsePhpCode($sPhpContent);
 			$oExpr = $aNodes[0];
 			return $this->EvaluateExpression($oExpr->expr);
 
diff --git a/setup/modulediscovery/evaluation/expression/SmallerEvaluator.php b/sources/PhpParser/Evaluation/SmallerEvaluator.php
similarity index 86%
rename from setup/modulediscovery/evaluation/expression/SmallerEvaluator.php
rename to sources/PhpParser/Evaluation/SmallerEvaluator.php
index ba276f017..5f5543e3f 100644
--- a/setup/modulediscovery/evaluation/expression/SmallerEvaluator.php
+++ b/sources/PhpParser/Evaluation/SmallerEvaluator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace evaluation\expression;
+namespace Combodo\iTop\PhpParser\Evaluation;;
 
 use PhpParser\Node\Expr\BinaryOp\Smaller;
 
diff --git a/setup/modulediscovery/evaluation/expression/SmallerOrEqualEvaluator.php b/sources/PhpParser/Evaluation/SmallerOrEqualEvaluator.php
similarity index 87%
rename from setup/modulediscovery/evaluation/expression/SmallerOrEqualEvaluator.php
rename to sources/PhpParser/Evaluation/SmallerOrEqualEvaluator.php
index 127a223ac..d69e7d1a0 100644
--- a/setup/modulediscovery/evaluation/expression/SmallerOrEqualEvaluator.php
+++ b/sources/PhpParser/Evaluation/SmallerOrEqualEvaluator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace evaluation\expression;
+namespace Combodo\iTop\PhpParser\Evaluation;;
 
 use PhpParser\Node\Expr\BinaryOp\SmallerOrEqual;
 
diff --git a/setup/modulediscovery/evaluation/expression/StaticCallEvaluator.php b/sources/PhpParser/Evaluation/StaticCallEvaluator.php
similarity index 95%
rename from setup/modulediscovery/evaluation/expression/StaticCallEvaluator.php
rename to sources/PhpParser/Evaluation/StaticCallEvaluator.php
index 6170a573e..c4be927b1 100644
--- a/setup/modulediscovery/evaluation/expression/StaticCallEvaluator.php
+++ b/sources/PhpParser/Evaluation/StaticCallEvaluator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace evaluation\expression;
+namespace Combodo\iTop\PhpParser\Evaluation;;
 
 use ModuleFileReaderException;
 use PhpParser\Node\Expr;
diff --git a/setup/modulediscovery/evaluation/expression/StaticPropertyFetchEvaluator.php b/sources/PhpParser/Evaluation/StaticPropertyFetchEvaluator.php
similarity index 94%
rename from setup/modulediscovery/evaluation/expression/StaticPropertyFetchEvaluator.php
rename to sources/PhpParser/Evaluation/StaticPropertyFetchEvaluator.php
index 076854953..cf6c63386 100644
--- a/setup/modulediscovery/evaluation/expression/StaticPropertyFetchEvaluator.php
+++ b/sources/PhpParser/Evaluation/StaticPropertyFetchEvaluator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace evaluation\expression;
+namespace Combodo\iTop\PhpParser\Evaluation;;
 
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\StaticPropertyFetch;
diff --git a/setup/modulediscovery/evaluation/expression/UnaryMinusEvaluator.php b/sources/PhpParser/Evaluation/UnaryMinusEvaluator.php
similarity index 89%
rename from setup/modulediscovery/evaluation/expression/UnaryMinusEvaluator.php
rename to sources/PhpParser/Evaluation/UnaryMinusEvaluator.php
index 893226316..3b69b3303 100644
--- a/setup/modulediscovery/evaluation/expression/UnaryMinusEvaluator.php
+++ b/sources/PhpParser/Evaluation/UnaryMinusEvaluator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace evaluation\expression;
+namespace Combodo\iTop\PhpParser\Evaluation;;
 
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\BinaryOp;
diff --git a/setup/modulediscovery/evaluation/expression/VariableEvaluator.php b/sources/PhpParser/Evaluation/VariableEvaluator.php
similarity index 92%
rename from setup/modulediscovery/evaluation/expression/VariableEvaluator.php
rename to sources/PhpParser/Evaluation/VariableEvaluator.php
index e47f6f1fb..244446499 100644
--- a/setup/modulediscovery/evaluation/expression/VariableEvaluator.php
+++ b/sources/PhpParser/Evaluation/VariableEvaluator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace evaluation\expression;
+namespace Combodo\iTop\PhpParser\Evaluation;;
 
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\ClassConstFetch;
diff --git a/setup/modulediscovery/evaluation/expression/iExprEvaluator.php b/sources/PhpParser/Evaluation/iExprEvaluator.php
similarity index 78%
rename from setup/modulediscovery/evaluation/expression/iExprEvaluator.php
rename to sources/PhpParser/Evaluation/iExprEvaluator.php
index 27932e26c..15c27e766 100644
--- a/setup/modulediscovery/evaluation/expression/iExprEvaluator.php
+++ b/sources/PhpParser/Evaluation/iExprEvaluator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace evaluation\expression;
+namespace Combodo\iTop\PhpParser\Evaluation;;
 
 use PhpParser\Node\Expr;
 
diff --git a/tests/php-unit-tests/unitary-tests/setup/modulediscovery/PhpExpressionEvaluatorTest.php b/tests/php-unit-tests/unitary-tests/sources/PhpParser/Evaluation/PhpExpressionEvaluatorTest.php
similarity index 97%
rename from tests/php-unit-tests/unitary-tests/setup/modulediscovery/PhpExpressionEvaluatorTest.php
rename to tests/php-unit-tests/unitary-tests/sources/PhpParser/Evaluation/PhpExpressionEvaluatorTest.php
index 569f7b3d8..bb3b1f3a6 100644
--- a/tests/php-unit-tests/unitary-tests/setup/modulediscovery/PhpExpressionEvaluatorTest.php
+++ b/tests/php-unit-tests/unitary-tests/sources/PhpParser/Evaluation/PhpExpressionEvaluatorTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Combodo\iTop\Test\UnitTest\Setup\ModuleDiscovery;
+namespace Combodo\iTop\Test\UnitTest\Sources\PhpParser\Evaluation;
 
+use Combodo\iTop\PhpParser\Evaluation\PhpExpressionEvaluator;
 use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
-use evaluation\expression\PhpExpressionEvaluator;
 
 class PhpExpressionEvaluatorTest extends ItopDataTestCase {
 	public static $STATIC_PROPERTY = 123;