Source code reorganisation

Small improvements in the source code structure to disentangle dependencies.

Merge request reports

Loading