Some structural changes

Signed-off-by: Alexander Kluth <derhartmut@niwohlos.org>