Adding the client to the server standalone as well, refactorings to prevent naming issues