Update to start with SOLID and Controller -> Service