Moved schema to lib