move queryEngine to its pakcage
Merge pull request #12 from cnnic/master

merge from cnnic
refactor
refactor
Merge pull request #130 from forumbyr/master

refactor