rework class structure

Signed-off-by: Hagen Paul Pfeifer <hagen@jauu.net>
new options

Signed-off-by: Hagen Paul Pfeifer <hagen@jauu.net>