Refactoring: Begginings of a model layer