file structure changes, add modules to report generation to pull data into template