moved schema, added challenge template