Updated Class Diagramm and removed the template project