Refactoring the client folder