Moved last crud classes from query-api to crud module