Issue #3336991: Change module structure and naming

Closes #3336991

Merge request reports

Loading