refactored query utilite classes into a separate folder and added columnresolver