Move queries into files for client repo