Feature/refacture l3 core services

Merge request reports

Loading