Rename pquery.h to diagnostic/pquery.h