A few more mods to the schema, moved utils to a top level directory