Change all the package names ALL OF THEM
Add fields and _source into query DSL