updated classdiagram (final version?)