Refactor of model package
Merge branch 'master' of https://github.com/emmagustaf/uDoDo