Break up the layout return data structures into sections

Signed-off-by: Tom Haynes <loghyr@primarydata.com>