Refactoring the server, made a new UML