3.4 Service Layer + Refactoring class orders