Simplifies structure of figure generation for the report.
Restructure files for cleaner organisation.