REFACTORING: alle Klassen ohne _

Signed-off-by: Martika <Martika@MC2>
Change-Id: I92e5d2faad2665c011f21a7d931097a84d41ac65