Moved the client outside the server