Batching cleanup

Here's some better naming and structure for the supporting classes for batching and reading queries.