OPEN - issue AGOVA-50: Refactor Fql elements into a separate package 
https://issues.jboss.org/browse/AGOVA-50