refined Query and QuerySpec Model Objects. renamed packages