moved query classes to new package