LPS-32783 DL refactoring for new staging

Hey Julio,

Based on our discussion here goes the new version of the DL refactoring.

I've applied every aspect what we have discussed, and @KocsisDaniel reviewed it.

Thanks,

Máté