Split Query.js into Query.js and Simple.js files