Move the Query DSL to its own sub-module so it can be used by both embeded and remote query