Model layer refactored

Note: there’s no view controller yet
Tiny modification