Add new layout

Start moving things to the new layout.

Signed-off-by: Christoph Kassen <christoph@kassen.name>