organize imports
make QueryHelper independent of HQLQueryPlan and QueryTranslator