BatchLogger sources reorganized