Started refactoring operations on entities into their own classes in model layer
Started refactoring operations on entities into their own classes in model layer