massive structural changes ongoing

Signed-off-by: Dominik Beppler <dbeppler@web.de>