Refactoring model_building
Merge branch 'master' of github.com:ftomassetti/codemodels
wip