Refactored structure of report directories