new layout

Signed-off-by: Jakob Pupke <jakob.pupke@gmail.com>