Revert "Réorganisation architecture"

This reverts commit 83b8ed67e960b386dd4b063ac4df5fbc8ec982af.
Revert "Revert "Réorganisation architecture""

This reverts commit c25cec2935348cb6d327d0c994b5c4217340f834.