Update querydispatecher package names.
Organize code generation.