Issue #3387385: Restructure components

Merge request reports

Loading