Changing structure of reports to be under reports namespace