turned Query into a class

[jimmywarting]

got surprised that it still runs fine after mostly auto converting it using vscode had to make few minor adjustment, added a proxy to make it still work without using new keyword also got rid of inherit