Merge "Refactor reporting dir"