Assigning each report to a folder

As well as adapting the second report whose draft was written by Heitor
to the folder format.