Some restructuring

Signed-off-by: Daniel Borchmann <daniel.borchmann@mailbox.tu-dresden.de>