MB-100: Reconstruct report file structure

Change-Id: I88061a7a3a6027faef0fac2296b8dd5d35c23bc7