Correctly move queries classes.