Moved querygenerator into the abstract folder