Move more queries to Query namespace, with parent object to call between modules

Move more queries to Query namespace, with parent object to call between modules #195