To help with clear code ownership and componentization, we should try to split up the code in the src/mongo/s/query directory. One idea would be to create s/query/exec and s/query/planner subdirectories for the QE code and the QO code respectively.