Reorganized report structure