refactoring model (factories + class Model)
fin du merge!!!!