Improve the layout of dervied data location.

Signed-off-by: Aron Cedercrantz <aron@cedercrantz.se>