LPS-45615 refactor move code in DL and Journal

@sergiogonzalez, please have a look at the DL changes. Thanks!