Move queries into a single file