update imports to reflect the moved BatchContext