Code Reorganization
Class diagramm is deleted