Starting refactoring of the client.