Mihir | Some refactoring
Vinay, Mihir | Fixing building hibernate session factory