Improoved report with folders/files organization.