Reconcile DDL and JSON layouts.

Signed-off-by: Christophe Taton <taton@wibidata.com>