Split batch functionality between dedicated files