Refactor Report
Remove dummy template
Fix import errors