Revert "Réorganisation du code"

This reverts commit a71d56407874922e8ea0c3daf31b561973591287.