Changes to database layout

Signed-off-by: Christian Gläser <glaeser@7says.de>