diff --git a/src/plugins/e-acsl/.Makefile.lint b/src/plugins/e-acsl/.Makefile.lint
index 758d9b5af383b304d78c5a666065d92b32d495be..e513a673fa3b459bc4fd6cb0bae46f39f5b5afc9 100644
--- a/src/plugins/e-acsl/.Makefile.lint
+++ b/src/plugins/e-acsl/.Makefile.lint
@@ -1,43 +1,45 @@
 ML_LINT_KO+=src/plugins/e-acsl/E_ACSL.mli
-ML_LINT_KO+=src/plugins/e-acsl/at_with_lscope.ml
-ML_LINT_KO+=src/plugins/e-acsl/at_with_lscope.mli
-ML_LINT_KO+=src/plugins/e-acsl/builtins.ml
 ML_LINT_KO+=src/plugins/e-acsl/demo/script.ml
-ML_LINT_KO+=src/plugins/e-acsl/dup_functions.ml
-ML_LINT_KO+=src/plugins/e-acsl/env.ml
-ML_LINT_KO+=src/plugins/e-acsl/env.mli
-ML_LINT_KO+=src/plugins/e-acsl/error.ml
-ML_LINT_KO+=src/plugins/e-acsl/error.mli
-ML_LINT_KO+=src/plugins/e-acsl/exit_points.ml
-ML_LINT_KO+=src/plugins/e-acsl/exit_points.mli
-ML_LINT_KO+=src/plugins/e-acsl/functions.ml
-ML_LINT_KO+=src/plugins/e-acsl/functions.mli
-ML_LINT_KO+=src/plugins/e-acsl/gmpz.ml
-ML_LINT_KO+=src/plugins/e-acsl/gmpz.mli
-ML_LINT_KO+=src/plugins/e-acsl/interval.ml
-ML_LINT_KO+=src/plugins/e-acsl/keep_status.ml
-ML_LINT_KO+=src/plugins/e-acsl/label.ml
-ML_LINT_KO+=src/plugins/e-acsl/literal_strings.ml
-ML_LINT_KO+=src/plugins/e-acsl/loops.ml
-ML_LINT_KO+=src/plugins/e-acsl/loops.mli
-ML_LINT_KO+=src/plugins/e-acsl/lscope.ml
-ML_LINT_KO+=src/plugins/e-acsl/lscope.mli
-ML_LINT_KO+=src/plugins/e-acsl/main.ml
-ML_LINT_KO+=src/plugins/e-acsl/misc.ml
-ML_LINT_KO+=src/plugins/e-acsl/misc.mli
-ML_LINT_KO+=src/plugins/e-acsl/mmodel_analysis.ml
-ML_LINT_KO+=src/plugins/e-acsl/mmodel_translate.ml
-ML_LINT_KO+=src/plugins/e-acsl/mmodel_translate.mli
-ML_LINT_KO+=src/plugins/e-acsl/options.ml
-ML_LINT_KO+=src/plugins/e-acsl/prepare_ast.ml
-ML_LINT_KO+=src/plugins/e-acsl/quantif.ml
-ML_LINT_KO+=src/plugins/e-acsl/quantif.mli
-ML_LINT_KO+=src/plugins/e-acsl/rte.ml
-ML_LINT_KO+=src/plugins/e-acsl/temporal.ml
-ML_LINT_KO+=src/plugins/e-acsl/temporal.mli
+ML_LINT_KO+=src/plugins/e-acsl/src/analyses/exit_points.ml
+ML_LINT_KO+=src/plugins/e-acsl/src/analyses/exit_points.mli
+ML_LINT_KO+=src/plugins/e-acsl/src/analyses/interval.ml
+ML_LINT_KO+=src/plugins/e-acsl/src/analyses/literal_strings.ml
+ML_LINT_KO+=src/plugins/e-acsl/src/analyses/lscope.ml
+ML_LINT_KO+=src/plugins/e-acsl/src/analyses/lscope.mli
+ML_LINT_KO+=src/plugins/e-acsl/src/analyses/mmodel_analysis.ml
+ML_LINT_KO+=src/plugins/e-acsl/src/analyses/rte.ml
+ML_LINT_KO+=src/plugins/e-acsl/src/analyses/typing.ml
+ML_LINT_KO+=src/plugins/e-acsl/src/analyses/typing.mli
+ML_LINT_KO+=src/plugins/e-acsl/src/code_generator/at_with_lscope.ml
+ML_LINT_KO+=src/plugins/e-acsl/src/code_generator/at_with_lscope.mli
+ML_LINT_KO+=src/plugins/e-acsl/src/code_generator/env.ml
+ML_LINT_KO+=src/plugins/e-acsl/src/code_generator/env.mli
+ML_LINT_KO+=src/plugins/e-acsl/src/code_generator/gmp.ml
+ML_LINT_KO+=src/plugins/e-acsl/src/code_generator/label.ml
+ML_LINT_KO+=src/plugins/e-acsl/src/code_generator/logic_functions.ml
+ML_LINT_KO+=src/plugins/e-acsl/src/code_generator/loops.ml
+ML_LINT_KO+=src/plugins/e-acsl/src/code_generator/loops.mli
+ML_LINT_KO+=src/plugins/e-acsl/src/code_generator/mmodel_translate.ml
+ML_LINT_KO+=src/plugins/e-acsl/src/code_generator/mmodel_translate.mli
+ML_LINT_KO+=src/plugins/e-acsl/src/code_generator/quantif.ml
+ML_LINT_KO+=src/plugins/e-acsl/src/code_generator/quantif.mli
+ML_LINT_KO+=src/plugins/e-acsl/src/code_generator/rational.ml
+ML_LINT_KO+=src/plugins/e-acsl/src/code_generator/temporal.ml
+ML_LINT_KO+=src/plugins/e-acsl/src/code_generator/temporal.mli
+ML_LINT_KO+=src/plugins/e-acsl/src/code_generator/translate.ml
+ML_LINT_KO+=src/plugins/e-acsl/src/code_generator/translate.mli
+ML_LINT_KO+=src/plugins/e-acsl/src/code_generator/visit.ml
+ML_LINT_KO+=src/plugins/e-acsl/src/libraries/builtins.ml
+ML_LINT_KO+=src/plugins/e-acsl/src/libraries/error.ml
+ML_LINT_KO+=src/plugins/e-acsl/src/libraries/error.mli
+ML_LINT_KO+=src/plugins/e-acsl/src/libraries/functions.ml
+ML_LINT_KO+=src/plugins/e-acsl/src/libraries/functions.mli
+ML_LINT_KO+=src/plugins/e-acsl/src/libraries/misc.ml
+ML_LINT_KO+=src/plugins/e-acsl/src/libraries/misc.mli
+ML_LINT_KO+=src/plugins/e-acsl/src/main.ml
+ML_LINT_KO+=src/plugins/e-acsl/src/options.ml
+ML_LINT_KO+=src/plugins/e-acsl/src/project_initializer/dup_functions.ml
+ML_LINT_KO+=src/plugins/e-acsl/src/project_initializer/keep_status.ml
+ML_LINT_KO+=src/plugins/e-acsl/src/project_initializer/prepare_ast.ml
+ML_LINT_KO+=src/plugins/e-acsl/src/project_initializer/prepare_ast.mli
 ML_LINT_KO+=src/plugins/e-acsl/top/E_ACSL.mli
-ML_LINT_KO+=src/plugins/e-acsl/translate.ml
-ML_LINT_KO+=src/plugins/e-acsl/translate.mli
-ML_LINT_KO+=src/plugins/e-acsl/typing.ml
-ML_LINT_KO+=src/plugins/e-acsl/typing.mli
-ML_LINT_KO+=src/plugins/e-acsl/visit.ml