Getting things straight regarding classes and so on...

Signed-off-by: Alexander Kluth <contact@alexanderkluth.com>