Renamed query module to uri