Flatten the schema setup

Merged
JV
3mo ago
+1229-1283

Signed-off-by: Juan Cruz Viotti jv@jviotti.com