restructure

Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org>