Move querybuilder package to core