Restructured controllers and fixed how reports are presented
Deleted old controller