Layout change.

Signed-off-by: Marco Casella <marco.casella+git@gmail.com>