Move core task stuff into batch namespace