- restructuring project structure
- cleaned batch datastructure