Shuffle queries into their own package.