further refactoring to class file, maybe documentation has to be updated at some places

Signed-off-by: Thomas Quaritsch <t.quaritsch@gmail.com>