Removed "Legacy" from QueryAdapter namespace.
Moved overrride query feature/Query generation to base class.