Move schema to it's own library outside duv