Move QueryControlProxy definitions into modules sub-directory.