Changed classes with a big change in the class diagram

Signed-off-by: Imkerix <Imkerix@live.de>
Changed a lot of classes with a big change in the class diagram 

Signed-off-by: Imkerix <Imkerix@live.de>