[ronald, silviu] moved code to application and batch modules
Merge remote-tracking branch 'origin/master'