CMS-2471 Improve query parser. Renamed a package.