Refactoring Servlets and add Service classes