Reorden queryTP in proper packages and change imports
Add @NotNull