Sowmya & Kumaran | #737 | Refactored the code to do manual DI. Fixed an issue where the package was not cleaned up after the report generation.