Completed restructuring except for report.html
