Moved DataQuery to the Data directory.
Moved DataQuery to the Data directory.
Removed debug test comments and changed it to have an initial allocation to accommodate size of the enums.