[#1013] Move batch package.
Move import order.
Merge pull request #1027 from akbargumbira/develop

Fix #1013