Revert "modif model & controllers"

This reverts commit 32794fe390da79f09cb445bc5ed536db77807d20.
Revert "Revert "modif model & controllers""

This reverts commit 85bfc98f337bcc13b139961d764931ff14d67c86.