Changed server names and added UML Diagrams