#26 moved query buildign to own package, moved main Client classes to
main package