Refactor model according to some forum
project refactoring in progress, working on the admin zone