Moving query modules to a single file