Refactor packages
Add batch daemon