Cleaning up configuration files and queryStatements handler
Fixing a conflict in gitignore