Refactor class structure

Merge request reports

Loading